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

Revert "Added notifications toggle to user groups (#10450)"

Browse Source 
This reverts commit 4c6d4b9326.
This commit is contained in:
Sebastiaan Janssen
2021-12-16 16:30:18 +01:00
parent a3b721bb4c
commit 7006461ba2
10 changed files with 10 additions and 52 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/Umbraco.Core/Migrations/Install/DatabaseDataCreator.cs
View File

@@ -188,9 +188,9 @@ namespace Umbraco.Core.Migrations.Install
private void CreateUserGroupData()
{
_database.Insert(Constants.DatabaseSchema.Tables.UserGroup, "id", false, new UserGroupDto { Id = 1, StartMediaId = -1, StartContentId = -1, Alias = Constants.Security.AdminGroupAlias, Name = "Administrators", DefaultPermissions = "CADMOSKTPIURZ:5F7ïN", CreateDate = DateTime.Now, UpdateDate = DateTime.Now, Icon = "icon-medal" });
_database.Insert(Constants.DatabaseSchema.Tables.UserGroup, "id", false, new UserGroupDto { Id = 2, StartMediaId = -1, StartContentId = -1, Alias = Constants.Security.WriterGroupAlias, Name = "Writers", DefaultPermissions = "CAH:FN", CreateDate = DateTime.Now, UpdateDate = DateTime.Now, Icon = "icon-edit" });
_database.Insert(Constants.DatabaseSchema.Tables.UserGroup, "id", false, new UserGroupDto { Id = 3, StartMediaId = -1, StartContentId = -1, Alias = Constants.Security.EditorGroupAlias, Name = "Editors", DefaultPermissions = "CADMOSKTPUZ:5FïN", CreateDate = DateTime.Now, UpdateDate = DateTime.Now, Icon = "icon-tools" });
_database.Insert(Constants.DatabaseSchema.Tables.UserGroup, "id", false, new UserGroupDto { Id = 1, StartMediaId = -1, StartContentId = -1, Alias = Constants.Security.AdminGroupAlias, Name = "Administrators", DefaultPermissions = "CADMOSKTPIURZ:5F7ï", CreateDate = DateTime.Now, UpdateDate = DateTime.Now, Icon = "icon-medal" });
_database.Insert(Constants.DatabaseSchema.Tables.UserGroup, "id", false, new UserGroupDto { Id = 2, StartMediaId = -1, StartContentId = -1, Alias = Constants.Security.WriterGroupAlias, Name = "Writers", DefaultPermissions = "CAH:F", CreateDate = DateTime.Now, UpdateDate = DateTime.Now, Icon = "icon-edit" });
_database.Insert(Constants.DatabaseSchema.Tables.UserGroup, "id", false, new UserGroupDto { Id = 3, StartMediaId = -1, StartContentId = -1, Alias = Constants.Security.EditorGroupAlias, Name = "Editors", DefaultPermissions = "CADMOSKTPUZ:5Fï", CreateDate = DateTime.Now, UpdateDate = DateTime.Now, Icon = "icon-tools" });
_database.Insert(Constants.DatabaseSchema.Tables.UserGroup, "id", false, new UserGroupDto { Id = 4, StartMediaId = -1, StartContentId = -1, Alias = Constants.Security.TranslatorGroupAlias, Name = "Translators", DefaultPermissions = "AF", CreateDate = DateTime.Now, UpdateDate = DateTime.Now, Icon = "icon-globe" });
_database.Insert(Constants.DatabaseSchema.Tables.UserGroup, "id", false, new UserGroupDto { Id = 5, StartMediaId = -1, StartContentId = -1, Alias = Constants.Security.SensitiveDataGroupAlias, Name = "Sensitive data", DefaultPermissions = "", CreateDate = DateTime.Now, UpdateDate = DateTime.Now, Icon = "icon-lock" });
}

5
src/Umbraco.Core/Migrations/Upgrade/UmbracoPlan.cs
View File

@@ -211,11 +211,8 @@ namespace Umbraco.Core.Migrations.Upgrade
// to 8.17.0
To<AddPropertyTypeGroupColumns>("{153865E9-7332-4C2A-9F9D-F20AEE078EC7}");
// to 8.18.0
To<AddContentVersionCleanupFeature>("{8BAF5E6C-DCB7-41AE-824F-4215AE4F1F98}");
To<AddDefaultForNotificationsToggle>("{AD3D3B7F-8E74-45A4-85DB-7FFAD57F9243}");
//FINAL
To<AddContentVersionCleanupFeature>("{8BAF5E6C-DCB7-41AE-824F-4215AE4F1F98}");
}
}
}

15
src/Umbraco.Core/Migrations/Upgrade/V_8_18_0/AddDefaultForNotificationsToggle.cs
View File

@@ -1,15 +0,0 @@
namespace Umbraco.Core.Migrations.Upgrade.V_8_18_0
{
public class AddDefaultForNotificationsToggle : MigrationBase
{
public AddDefaultForNotificationsToggle(IMigrationContext context) : base(context)
{
}
public override void Migrate()
{
var updateSQL = Sql($"UPDATE {Constants.DatabaseSchema.Tables.UserGroup} SET userGroupDefaultPermissions = userGroupDefaultPermissions + 'N' WHERE userGroupAlias IN ('admin', 'writer', 'editor')");
Execute.Sql(updateSQL.SQL).Do();
}
}
}

1
src/Umbraco.Core/Umbraco.Core.csproj
View File

@@ -151,7 +151,6 @@
<Compile Include="Migrations\Upgrade\V_8_10_0\AddPropertyTypeLabelOnTopColumn.cs" />
<Compile Include="Migrations\Upgrade\V_8_17_0\AddPropertyTypeGroupColumns.cs" />
<Compile Include="Migrations\Upgrade\V_8_18_0\AddContentVersionCleanupFeature.cs" />
<Compile Include="Migrations\Upgrade\V_8_18_0\AddDefaultForNotificationsToggle.cs" />
<Compile Include="Migrations\Upgrade\V_8_9_0\ExternalLoginTableUserData.cs" />
<Compile Include="Models\Blocks\BlockEditorDataConverter.cs" />
<Compile Include="Models\Blocks\BlockEditorData.cs" />

1
src/Umbraco.Web.UI/Umbraco/config/lang/da.xml
View File

@@ -85,7 +85,6 @@
<key alias="translate">Tillad adgang til at oversætte en node</key>
<key alias="update">Tillad adgang til at gemme en node</key>
<key alias="createblueprint">Tillad adgang til at oprette en indholdsskabelon</key>
<key alias="notify">Tillad adgang til at oprette notificeringer for noder</key>
</area>
<area alias="apps">
<key alias="umbContent">Indhold</key>

1
src/Umbraco.Web.UI/Umbraco/config/lang/en.xml
View File

@@ -82,7 +82,6 @@
<key alias="translate">Allow access to translate a node</key>
<key alias="update">Allow access to save a node</key>
<key alias="createblueprint">Allow access to create a Content Template</key>
<key alias="notify">Allow access to setup notifications for content nodes</key>
</area>
<area alias="apps">
<key alias="umbContent">Content</key>

1
src/Umbraco.Web.UI/Umbraco/config/lang/en_us.xml
View File

@@ -83,7 +83,6 @@
<key alias="translate">Allow access to translate a node</key>
<key alias="update">Allow access to save a node</key>
<key alias="createblueprint">Allow access to create a Content Template</key>
<key alias="notify">Allow access to setup notifications for content nodes</key>
</area>
<area alias="apps">
<key alias="umbContent">Content</key>

24
src/Umbraco.Web/Actions/ActionNotify.cs
View File

@@ -1,24 +0,0 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
using Umbraco.Core;
namespace Umbraco.Web.Actions
{
public class ActionNotify : IAction
{
public char Letter => 'N';
public bool ShowInNotifier => false;
public bool CanBePermissionAssigned => true;
public string Icon => "megaphone";
public string Alias => "notify";
public string Category => Constants.Conventions.PermissionCategories.ContentCategory;
}
}

7
src/Umbraco.Web/Trees/ContentTreeController.cs
View File

@@ -242,7 +242,12 @@ namespace Umbraco.Web.Trees
if (EmailSender.CanSendRequiredEmail)
{
AddActionNode<ActionNotify>(item, menu, true, opensDialog: true);
menu.Items.Add(new MenuItem("notify", Services.TextService)
{
Icon = "megaphone",
SeparatorBefore = true,
OpensDialog = true
});
}
if((item is DocumentEntitySlim documentEntity && documentEntity.IsContainer) == false)

1
src/Umbraco.Web/Umbraco.Web.csproj
View File

@@ -136,7 +136,6 @@
<Compile Include="..\SolutionInfo.cs">
<Link>Properties\SolutionInfo.cs</Link>
</Compile>
<Compile Include="Actions\ActionNotify.cs" />
<Compile Include="AppBuilderExtensions.cs" />
<Compile Include="AreaRegistrationContextExtensions.cs" />
<Compile Include="AspNetHttpContextAccessor.cs" />