yv01p/Umbraco-CMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/7.0.0' into 7.0.0

Browse Source
This commit is contained in:
Stephan
2013-10-11 12:28:56 +02:00
parent 4b36dcc13b b92f5c4719
commit 4740e5f0c7
4 changed files with 50 additions and 78 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/Umbraco.Web.UI/Umbraco.Web.UI.csproj
View File

@@ -626,9 +626,9 @@
<None Include="Config\404handlers.Release.config">
<DependentUpon>404handlers.config</DependentUpon>
</None>
<Content Include="Config\appSettings.Release.config">
<None Include="Config\appSettings.Release.config">
<SubType>Designer</SubType>
</Content>
</None>
<None Include="Config\ClientDependency.Release.config">
<DependentUpon>ClientDependency.config</DependentUpon>
<SubType>Designer</SubType>
@@ -639,7 +639,7 @@
<None Include="Config\BaseRestExtensions.Release.config">
<DependentUpon>BaseRestExtensions.config</DependentUpon>
</None>
<Content Include="Config\connectionStrings.Release.config" />
<None Include="Config\connectionStrings.Release.config" />
<None Include="Config\log4net.Release.config">
<DependentUpon>log4net.config</DependentUpon>
</None>

96
src/Umbraco.Web.UI/umbraco/config/create/UI.Release.xml
View File

@@ -130,7 +130,7 @@
<create assembly="umbraco" type="MediaTypeTasks" />
<delete assembly="umbraco" type="MediaTypeTasks" />
</tasks>
</nodeType>
</nodeType>
<nodeType alias="initmember">
<header>member</header>
<usercontrol>/create/member.ascx</usercontrol>
@@ -236,36 +236,34 @@
<delete assembly="umbraco" type="cacheTasks" />
</tasks>
</nodeType>
<nodeType alias="initpython">
<header>Scripting file</header>
<usercontrol>/create/DLRScripting.ascx</usercontrol>
<tasks>
<create assembly="umbraco" type="PythonTasks" />
</tasks>
</nodeType>
<nodeType alias="python">
<header>Macro</header>
<usercontrol>/create/DLRScripting.ascx</usercontrol>
<tasks>
<delete assembly="umbraco" type="PythonTasks" />
</tasks>
</nodeType>
<nodeType alias="initdlrscripting">
<header>Scripting file</header>
<usercontrol>/create/DLRScripting.ascx</usercontrol>
<tasks>
<create assembly="umbraco" type="DLRScriptingTasks" />
</tasks>
</nodeType>
<nodeType alias="dlrscripting">
<header>Macro</header>
<usercontrol>/create/DLRScripting.ascx</usercontrol>
<tasks>
<delete assembly="umbraco" type="DLRScriptingTasks" />
</tasks>
</nodeType>
<nodeType alias="initpython">
<header>Scripting file</header>
<usercontrol>/create/DLRScripting.ascx</usercontrol>
<tasks>
<create assembly="umbraco" type="PythonTasks" />
</tasks>
</nodeType>
<nodeType alias="python">
<header>Macro</header>
<usercontrol>/create/DLRScripting.ascx</usercontrol>
<tasks>
<delete assembly="umbraco" type="PythonTasks" />
</tasks>
</nodeType>
<nodeType alias="initdlrscripting">
<header>Scripting file</header>
<usercontrol>/create/DLRScripting.ascx</usercontrol>
<tasks>
<create assembly="umbraco" type="DLRScriptingTasks" />
</tasks>
</nodeType>
<nodeType alias="dlrscripting">
<header>Macro</header>
<usercontrol>/create/DLRScripting.ascx</usercontrol>
<tasks>
<delete assembly="umbraco" type="DLRScriptingTasks" />
</tasks>
</nodeType>
<nodeType alias="initscripts">
<header>Script file</header>
<usercontrol>/create/script.ascx</usercontrol>
@@ -324,22 +322,20 @@
<delete assembly="umbraco" type="cms.presentation.user.UserTypeTasks" />
</tasks>
</nodeType>
<nodeType alias="partialViews">
<header>Macro</header>
<usercontrol>/create/simple.ascx</usercontrol>
<tasks>
<create assembly="umbraco" type="PartialViewTasks" />
<delete assembly="umbraco" type="PartialViewTasks" />
</tasks>
</nodeType>
<nodeType alias="partialViewMacros">
<header>Macro</header>
<usercontrol>/Create/PartialViewMacro.ascx</usercontrol>
<tasks>
<create assembly="umbraco" type="MacroPartialViewTasks" />
<delete assembly="umbraco" type="MacroPartialViewTasks" />
</tasks>
</nodeType>
</createUI>
<nodeType alias="partialViews">
<header>Macro</header>
<usercontrol>/Create/PartialView.ascx</usercontrol>
<tasks>
<create assembly="umbraco" type="PartialViewTasks" />
<delete assembly="umbraco" type="PartialViewTasks" />
</tasks>
</nodeType>
<nodeType alias="partialViewMacros">
<header>Macro</header>
<usercontrol>/Create/PartialViewMacro.ascx</usercontrol>
<tasks>
<create assembly="umbraco" type="PartialViewMacroTasks" />
<delete assembly="umbraco" type="PartialViewMacroTasks" />
</tasks>
</nodeType>
</createUI>

24
src/Umbraco.Web.UI/umbraco/config/create/UI.xml
View File

@@ -338,28 +338,4 @@
<delete assembly="umbraco" type="PartialViewMacroTasks" />
</tasks>
</nodeType>
<nodeType alias="forms">
<header>Forms</header>
<usercontrol>/plugins/umbracocontour/createform.ascx</usercontrol>
<tasks>
<create assembly="Umbraco.Forms.UI" type="Tasks.FormTasks" />
<delete assembly="Umbraco.Forms.UI" type="Tasks.FormTasks" />
</tasks>
</nodeType>
<nodeType alias="formdatasources">
<header>Datasources</header>
<usercontrol>/create/simple.ascx</usercontrol>
<tasks>
<create assembly="Umbraco.Forms.UI" type="Tasks.DataSourceTasks" />
<delete assembly="Umbraco.Forms.UI" type="Tasks.DataSourceTasks" />
</tasks>
</nodeType>
<nodeType alias="formprevaluesource">
<header>Prevalue source</header>
<usercontrol>/create/simple.ascx</usercontrol>
<tasks>
<create assembly="Umbraco.Forms.UI" type="Tasks.PrevalueSourceTasks" />
<delete assembly="Umbraco.Forms.UI" type="Tasks.PrevalueSourceTasks" />
</tasks>
</nodeType>
</createUI>

2
src/Umbraco.Web/Editors/EntityController.cs
View File

@@ -96,7 +96,7 @@ namespace Umbraco.Web.Editors
case UmbracoEntityTypes.Member:
searcher = Constants.Examine.InternalMemberSearcher;
type = "member";
fields = new[] { "id", "email", "login","name", "nodename"};
fields = new[] { "id", "email", "loginName","nodeName"};
break;
case UmbracoEntityTypes.Media:
type = "media";