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

Fixes reference to new member group tree alias "memberGroups" (breaking because of U4-7150)

Browse Source
This commit is contained in:
Shannon
2015-12-16 16:07:56 +01:00
parent 5d4f4376dd
commit ea86c8bcff
8 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/Umbraco.Tests/Migrations/SqlScripts/MySqlTotal-480.sql
+1 -1
View File
@@ -555,7 +555,7 @@ INSERT INTO umbracoAppTree (appAlias, treeAlias, treeSilent, treeInitialize, tre
('media', 'media', 0, 1, 0, 'Medier', 'folder.gif', 'folder_o.gif', 'umbraco', 'loadMedia'),
('member', 'member', 0, 1, 0, 'Medlemmer', 'folder.gif', 'folder_o.gif', 'umbraco', 'loadMembers'),
('member', 'memberGroup', 0, 1, 1, 'MemberGroups', 'folder.gif', 'folder_o.gif', 'umbraco', 'loadMemberGroups'),
('member', 'memberGroups', 0, 1, 1, 'MemberGroups', 'folder.gif', 'folder_o.gif', 'umbraco', 'loadMemberGroups'),
('member', 'memberType', 0, 1, 2, 'Medlemstyper', 'folder.gif', 'folder_o.gif', 'umbraco', 'loadMemberTypes'),
('settings', 'languages', 0, 1, 4, 'Languages', 'folder.gif', 'folder_o.gif', 'umbraco', 'loadLanguages'),
('settings', 'mediaTypes', 0, 1, 5, 'Medietyper', 'folder.gif', 'folder_o.gif', 'umbraco', 'loadMediaTypes'),
src/Umbraco.Tests/Migrations/SqlScripts/SqlServerTotal-480.sql
+1 -1
View File
@@ -693,7 +693,7 @@ INSERT INTO [umbracoAppTree] ([appAlias], [treeAlias], [treeSilent], [treeInitia
INSERT INTO [umbracoAppTree] ([appAlias], [treeAlias], [treeSilent], [treeInitialize], [treeSortOrder], [treeTitle], [treeIconClosed], [treeIconOpen], [treeHandlerAssembly], [treeHandlerType]) VALUES (N'media', N'media', 0, 1, 0, N'Medier', N'.sprTreeFolder', N'.sprTreeFolder_o', N'umbraco', N'loadMedia')
INSERT INTO [umbracoAppTree] ([appAlias], [treeAlias], [treeSilent], [treeInitialize], [treeSortOrder], [treeTitle], [treeIconClosed], [treeIconOpen], [treeHandlerAssembly], [treeHandlerType]) VALUES (N'member', N'member', 0, 1, 0, N'Medlemmer', N'.sprTreeFolder', N'.sprTreeFolder_o', N'umbraco', N'loadMembers')
INSERT INTO [umbracoAppTree] ([appAlias], [treeAlias], [treeSilent], [treeInitialize], [treeSortOrder], [treeTitle], [treeIconClosed], [treeIconOpen], [treeHandlerAssembly], [treeHandlerType]) VALUES (N'member', N'memberGroup', 0, 1, 1, N'MemberGroups', N'.sprTreeFolder', N'.sprTreeFolder_o', N'umbraco', N'loadMemberGroups')
INSERT INTO [umbracoAppTree] ([appAlias], [treeAlias], [treeSilent], [treeInitialize], [treeSortOrder], [treeTitle], [treeIconClosed], [treeIconOpen], [treeHandlerAssembly], [treeHandlerType]) VALUES (N'member', N'memberGroups', 0, 1, 1, N'MemberGroups', N'.sprTreeFolder', N'.sprTreeFolder_o', N'umbraco', N'loadMemberGroups')
INSERT INTO [umbracoAppTree] ([appAlias], [treeAlias], [treeSilent], [treeInitialize], [treeSortOrder], [treeTitle], [treeIconClosed], [treeIconOpen], [treeHandlerAssembly], [treeHandlerType]) VALUES (N'member', N'memberType', 0, 1, 2, N'Medlemstyper', N'.sprTreeFolder', N'.sprTreeFolder_o', N'umbraco', N'loadMemberTypes')
INSERT INTO [umbracoAppTree] ([appAlias], [treeAlias], [treeSilent], [treeInitialize], [treeSortOrder], [treeTitle], [treeIconClosed], [treeIconOpen], [treeHandlerAssembly], [treeHandlerType], [action]) VALUES (N'settings', N'dictionary', 0, 1, 3, N'Dictionary', N'.sprTreeFolder', N'.sprTreeFolder_o', N'umbraco', N'loadDictionary', N'openDictionary()')
INSERT INTO [umbracoAppTree] ([appAlias], [treeAlias], [treeSilent], [treeInitialize], [treeSortOrder], [treeTitle], [treeIconClosed], [treeIconOpen], [treeHandlerAssembly], [treeHandlerType]) VALUES (N'settings', N'languages', 0, 1, 4, N'Languages', N'.sprTreeFolder', N'.sprTreeFolder_o', N'umbraco', N'loadLanguages')
src/Umbraco.Web.UI.Client/src/views/common/dialogs/membergrouppicker.html
+1 -1
View File
@@ -4,7 +4,7 @@
<div>
<umb-tree section="member"
treealias="memberGroup"
treealias="memberGroups"
hideheader="true"
hideoptions="true"
isdialog="true"
src/Umbraco.Web.UI.Client/src/views/common/overlays/membergrouppicker/membergrouppicker.html
+1 -1
View File
@@ -1,7 +1,7 @@
<div ng-controller="Umbraco.Overlays.MemberGroupPickerController">
<umb-tree section="member"
treealias="memberGroup"
treealias="memberGroups"
hideheader="true"
hideoptions="true"
isdialog="true"
src/Umbraco.Web.UI/umbraco/config/create/UI.Release.xml
+1 -1
View File
@@ -159,7 +159,7 @@
<delete assembly="umbraco" type="MemberTypeTasks" />
</tasks>
</nodeType>
<nodeType alias="memberGroup">
<nodeType alias="memberGroups">
<header>membergroup</header>
<usercontrol>/create/simple.ascx</usercontrol>
<tasks>
src/Umbraco.Web.UI/umbraco/config/create/UI.xml
+1 -1
View File
@@ -159,7 +159,7 @@
<delete assembly="umbraco" type="MemberTypeTasks" />
</tasks>
</nodeType>
<nodeType alias="memberGroup">
<nodeType alias="memberGroups">
<header>membergroup</header>
<usercontrol>/create/simple.ascx</usercontrol>
<tasks>
src/Umbraco.Web/Editors/LegacyController.cs
+1 -1
View File
@@ -52,7 +52,7 @@ namespace Umbraco.Web.Editors
if (httpContextAttempt.Success)
{
//this is a hack check based on legacy
if (nodeType == "memberGroup")
if (nodeType == "memberGroups")
{
LegacyDialogHandler.Delete(httpContextAttempt.Result, UmbracoUser, nodeType, 0, alias);
return Request.CreateResponse(HttpStatusCode.OK);
src/Umbraco.Web/umbraco.presentation/umbraco/webservices/legacyAjaxCalls.asmx.cs
+1 -1
View File
@@ -68,7 +68,7 @@ namespace umbraco.presentation.webservices
//check which parameters to pass depending on the types passed in
int intNodeId;
if (nodeType == "memberGroup")
if (nodeType == "memberGroups")
{
LegacyDialogHandler.Delete(
new HttpContextWrapper(HttpContext.Current),