Use constants for the common role names (#15751)

OrchardCMS · Apr 13, 2024 · e38011a · e38011a
1 parent 2d39c38
commit e38011a
Show file tree

Hide file tree

Showing 77 changed files with 147 additions and 130 deletions.
diff --git a/src/OrchardCore.Modules/OrchardCore.Admin/Permissions.cs b/src/OrchardCore.Modules/OrchardCore.Admin/Permissions.cs
@@ -20,27 +20,27 @@ public IEnumerable<PermissionStereotype> GetDefaultStereotypes() =>
     [
         new PermissionStereotype
         {
-            Name = "Administrator",
+            Name = OrchardCoreConstants.Roles.Administrator,
             Permissions = _allPermissions,
         },
         new PermissionStereotype
         {
-            Name = "Editor",
+            Name = OrchardCoreConstants.Roles.Editor,
             Permissions = _allPermissions,
         },
         new PermissionStereotype
         {
-            Name = "Moderator",
+            Name = OrchardCoreConstants.Roles.Moderator,
             Permissions = _allPermissions,
         },
         new PermissionStereotype
         {
-            Name = "Author",
+            Name = OrchardCoreConstants.Roles.Author,
             Permissions = _allPermissions,
         },
         new PermissionStereotype
         {
-            Name = "Contributor",
+            Name = OrchardCoreConstants.Roles.Contributor,
             Permissions = _allPermissions,
         },
     ];

diff --git a/src/OrchardCore.Modules/OrchardCore.Admin/PermissionsAdminSettings.cs b/src/OrchardCore.Modules/OrchardCore.Admin/PermissionsAdminSettings.cs
@@ -17,7 +17,7 @@ public IEnumerable<PermissionStereotype> GetDefaultStereotypes() =>
     [
         new PermissionStereotype
         {
-            Name = "Administrator",
+            Name = OrchardCoreConstants.Roles.Administrator,
             Permissions = _allPermissions,
         },
     ];

diff --git a/src/OrchardCore.Modules/OrchardCore.AdminDashboard/Permissions.cs b/src/OrchardCore.Modules/OrchardCore.AdminDashboard/Permissions.cs
@@ -27,27 +27,27 @@ public IEnumerable<PermissionStereotype> GetDefaultStereotypes() =>
     [
         new PermissionStereotype
         {
-            Name = "Administrator",
+            Name = OrchardCoreConstants.Roles.Administrator,
             Permissions = _allPermissions,
         },
         new PermissionStereotype
         {
-            Name = "Editor",
+            Name = OrchardCoreConstants.Roles.Editor,
             Permissions = _generalPermissions,
         },
         new PermissionStereotype
         {
-            Name = "Moderator",
+            Name = OrchardCoreConstants.Roles.Moderator,
             Permissions = _generalPermissions,
         },
         new PermissionStereotype
         {
-            Name = "Author",
+            Name = OrchardCoreConstants.Roles.Author,
             Permissions = _generalPermissions,
         },
         new PermissionStereotype
         {
-            Name = "Contributor",
+            Name = OrchardCoreConstants.Roles.Contributor,
             Permissions = _generalPermissions,
         },
     ];

diff --git a/...ules/OrchardCore.AdminDashboard/Views/DashboardWidget-ContentsMetadata.DetailAdmin.cshtml b/...ules/OrchardCore.AdminDashboard/Views/DashboardWidget-ContentsMetadata.DetailAdmin.cshtml
@@ -13,7 +13,7 @@
 {
     ContentItem contentItem = Model.ContentItem;
     var modifiedUtc = contentItem.ModifiedUtc?.ToString("yyyy-MM-ddTHH:mm:sszzz", CultureInfo.InvariantCulture);
-        var hasPublished = await ContentManager.HasPublishedVersionAsync(contentItem);
+    var hasPublished = await ContentManager.HasPublishedVersionAsync(contentItem);
     var hasDraft = contentItem.HasDraft();
 
     if (contentItem.ModifiedUtc.HasValue)

diff --git a/src/OrchardCore.Modules/OrchardCore.AdminMenu/Permissions.cs b/src/OrchardCore.Modules/OrchardCore.AdminMenu/Permissions.cs
@@ -46,12 +46,12 @@ public IEnumerable<PermissionStereotype> GetDefaultStereotypes() =>
     [
         new PermissionStereotype
         {
-            Name = "Administrator",
+            Name = OrchardCoreConstants.Roles.Administrator,
             Permissions = _generalPermissions,
         },
         new PermissionStereotype
         {
-            Name = "Editor",
+            Name = OrchardCoreConstants.Roles.Editor,
             Permissions = _generalPermissions,
         },
     ];

diff --git a/src/OrchardCore.Modules/OrchardCore.Apis.GraphQL/Permissions.cs b/src/OrchardCore.Modules/OrchardCore.Apis.GraphQL/Permissions.cs
@@ -22,7 +22,7 @@ public IEnumerable<PermissionStereotype> GetDefaultStereotypes() =>
     [
         new PermissionStereotype
         {
-            Name = "Administrator",
+            Name = OrchardCoreConstants.Roles.Administrator,
             Permissions =
             [
                 ExecuteGraphQLMutations,

diff --git a/src/OrchardCore.Modules/OrchardCore.AuditTrail/Permissions.cs b/src/OrchardCore.Modules/OrchardCore.AuditTrail/Permissions.cs
@@ -22,7 +22,7 @@ public IEnumerable<PermissionStereotype> GetDefaultStereotypes() =>
     [
         new PermissionStereotype
         {
-            Name = "Administrator",
+            Name = OrchardCoreConstants.Roles.Administrator,
             Permissions = _allPermissions
         },
     ];

diff --git a/src/OrchardCore.Modules/OrchardCore.Autoroute/Permissions.cs b/src/OrchardCore.Modules/OrchardCore.Autoroute/Permissions.cs
@@ -20,7 +20,7 @@ public IEnumerable<PermissionStereotype> GetDefaultStereotypes() =>
     [
         new PermissionStereotype
         {
-            Name = "Administrator",
+            Name = OrchardCoreConstants.Roles.Administrator,
             Permissions = _allPermissions,
         },
     ];

diff --git a/src/OrchardCore.Modules/OrchardCore.BackgroundTasks/Permissions.cs b/src/OrchardCore.Modules/OrchardCore.BackgroundTasks/Permissions.cs
@@ -20,7 +20,7 @@ public IEnumerable<PermissionStereotype> GetDefaultStereotypes() =>
     [
         new PermissionStereotype
         {
-            Name = "Administrator",
+            Name = OrchardCoreConstants.Roles.Administrator,
             Permissions = _allPermissions,
         },
     ];

diff --git a/src/OrchardCore.Modules/OrchardCore.ContentLocalization/Permissions.cs b/src/OrchardCore.Modules/OrchardCore.ContentLocalization/Permissions.cs
@@ -29,22 +29,22 @@ public IEnumerable<PermissionStereotype> GetDefaultStereotypes() =>
     [
         new PermissionStereotype
         {
-            Name = "Administrator",
+            Name = OrchardCoreConstants.Roles.Administrator,
             Permissions = _allPermissions,
         },
         new PermissionStereotype
         {
-            Name = "Editor",
+            Name = OrchardCoreConstants.Roles.Editor,
             Permissions = _allPermissions,
         },
         new PermissionStereotype
         {
-            Name = "Author",
+            Name = OrchardCoreConstants.Roles.Author,
             Permissions = _generalPermissions,
         },
         new PermissionStereotype
         {
-            Name = "Contributor",
+            Name = OrchardCoreConstants.Roles.Contributor,
             Permissions = _generalPermissions,
         },
     ];

diff --git a/src/OrchardCore.Modules/OrchardCore.ContentTypes/Permissions.cs b/src/OrchardCore.Modules/OrchardCore.ContentTypes/Permissions.cs
@@ -22,7 +22,7 @@ public IEnumerable<PermissionStereotype> GetDefaultStereotypes() =>
     [
         new PermissionStereotype
         {
-            Name = "Administrator",
+            Name = OrchardCoreConstants.Roles.Administrator,
             Permissions = _allPermissions,
         },
     ];

diff --git a/src/OrchardCore.Modules/OrchardCore.Contents/Permissions.cs b/src/OrchardCore.Modules/OrchardCore.Contents/Permissions.cs
@@ -58,7 +58,7 @@ public IEnumerable<PermissionStereotype> GetDefaultStereotypes() =>
     [
         new PermissionStereotype
         {
-            Name = "Administrator",
+            Name = OrchardCoreConstants.Roles.Administrator,
             Permissions =
             [
                 PublishContent,
@@ -73,7 +73,7 @@ public IEnumerable<PermissionStereotype> GetDefaultStereotypes() =>
         },
         new PermissionStereotype
         {
-            Name = "Editor",
+            Name = OrchardCoreConstants.Roles.Editor,
             Permissions =
             [
                 PublishContent,
@@ -86,7 +86,7 @@ public IEnumerable<PermissionStereotype> GetDefaultStereotypes() =>
         },
         new PermissionStereotype
         {
-            Name = "Author",
+            Name = OrchardCoreConstants.Roles.Author,
             Permissions =
             [
                 PublishOwnContent,
@@ -98,7 +98,7 @@ public IEnumerable<PermissionStereotype> GetDefaultStereotypes() =>
         },
         new PermissionStereotype
         {
-            Name = "Contributor",
+            Name = OrchardCoreConstants.Roles.Contributor,
             Permissions =
             [
                 EditOwnContent,
@@ -108,12 +108,12 @@ public IEnumerable<PermissionStereotype> GetDefaultStereotypes() =>
         },
         new PermissionStereotype
         {
-            Name = "Authenticated",
+            Name = OrchardCoreConstants.Roles.Authenticated,
             Permissions = _readerPermissions,
         },
         new PermissionStereotype
         {
-            Name = "Anonymous",
+            Name = OrchardCoreConstants.Roles.Anonymous,
             Permissions = _readerPermissions,
         },
     ];

diff --git a/src/OrchardCore.Modules/OrchardCore.Cors/Permissions.cs b/src/OrchardCore.Modules/OrchardCore.Cors/Permissions.cs
@@ -21,7 +21,7 @@ public IEnumerable<PermissionStereotype> GetDefaultStereotypes() =>
     [
         new PermissionStereotype
         {
-            Name = "Administrator",
+            Name = OrchardCoreConstants.Roles.Administrator,
             Permissions = _allPermissions,
         },
     ];

diff --git a/src/OrchardCore.Modules/OrchardCore.Demo/Permissions.cs b/src/OrchardCore.Modules/OrchardCore.Demo/Permissions.cs
@@ -28,30 +28,30 @@ public IEnumerable<PermissionStereotype> GetDefaultStereotypes() =>
     [
         new PermissionStereotype
         {
-            Name = "Authenticated",
+            Name = OrchardCoreConstants.Roles.Authenticated,
             Permissions =
             [
                 DemoAPIAccess,
             ],
         },
         new PermissionStereotype
         {
-            Name = "Editor",
+            Name = OrchardCoreConstants.Roles.Editor,
             Permissions = _generalPermissions,
         },
         new PermissionStereotype
         {
-            Name = "Moderator",
+            Name = OrchardCoreConstants.Roles.Moderator,
             Permissions = _generalPermissions,
         },
         new PermissionStereotype
         {
-            Name = "Contributor",
+            Name = OrchardCoreConstants.Roles.Contributor,
             Permissions = _generalPermissions,
         },
         new PermissionStereotype
         {
-            Name = "Author",
+            Name = OrchardCoreConstants.Roles.Author,
             Permissions = _generalPermissions,
         },
     ];

diff --git a/src/OrchardCore.Modules/OrchardCore.Deployment.Remote/Permissions.cs b/src/OrchardCore.Modules/OrchardCore.Deployment.Remote/Permissions.cs
@@ -24,7 +24,7 @@ public IEnumerable<PermissionStereotype> GetDefaultStereotypes() =>
     [
         new PermissionStereotype
         {
-            Name = "Administrator",
+            Name = OrchardCoreConstants.Roles.Administrator,
             Permissions = _allPermissions,
         },
     ];

diff --git a/src/OrchardCore.Modules/OrchardCore.Deployment/Permissions.cs b/src/OrchardCore.Modules/OrchardCore.Deployment/Permissions.cs
@@ -24,7 +24,7 @@ public IEnumerable<PermissionStereotype> GetDefaultStereotypes() =>
     [
         new PermissionStereotype
         {
-            Name = "Administrator",
+            Name = OrchardCoreConstants.Roles.Administrator,
             Permissions = _allPermissions,
         },
     ];

diff --git a/src/OrchardCore.Modules/OrchardCore.Facebook/Permissions.cs b/src/OrchardCore.Modules/OrchardCore.Facebook/Permissions.cs
@@ -20,7 +20,7 @@ public IEnumerable<PermissionStereotype> GetDefaultStereotypes() =>
     [
         new PermissionStereotype
         {
-            Name = "Administrator",
+            Name = OrchardCoreConstants.Roles.Administrator,
             Permissions = _allPermissions,
         },
     ];

diff --git a/src/OrchardCore.Modules/OrchardCore.Facebook/PixelPermissionProvider.cs b/src/OrchardCore.Modules/OrchardCore.Facebook/PixelPermissionProvider.cs
@@ -20,7 +20,7 @@ public IEnumerable<PermissionStereotype> GetDefaultStereotypes() =>
     [
         new PermissionStereotype
         {
-            Name = "Administrator",
+            Name = OrchardCoreConstants.Roles.Administrator,
             Permissions = _allPermissions,
         },
     ];

diff --git a/src/OrchardCore.Modules/OrchardCore.Features/Permissions.cs b/src/OrchardCore.Modules/OrchardCore.Features/Permissions.cs
@@ -20,7 +20,7 @@ public IEnumerable<PermissionStereotype> GetDefaultStereotypes() =>
     [
         new PermissionStereotype
         {
-            Name = "Administrator",
+            Name = OrchardCoreConstants.Roles.Administrator,
             Permissions = _allPermissions,
         },
     ];

diff --git a/src/OrchardCore.Modules/OrchardCore.GitHub/Permissions.cs b/src/OrchardCore.Modules/OrchardCore.GitHub/Permissions.cs
@@ -20,7 +20,7 @@ public IEnumerable<PermissionStereotype> GetDefaultStereotypes() =>
     [
         new PermissionStereotype
         {
-            Name = "Administrator",
+            Name = OrchardCoreConstants.Roles.Administrator,
             Permissions = _allPermissions,
         },
     ];

diff --git a/src/OrchardCore.Modules/OrchardCore.Google/GoogleAnalyticsPermissionsProvider.cs b/src/OrchardCore.Modules/OrchardCore.Google/GoogleAnalyticsPermissionsProvider.cs
@@ -20,7 +20,7 @@ public IEnumerable<PermissionStereotype> GetDefaultStereotypes() =>
     [
         new PermissionStereotype
         {
-            Name = "Administrator",
+            Name = OrchardCoreConstants.Roles.Administrator,
             Permissions = _allPermissions,
         },
     ];

diff --git a/src/OrchardCore.Modules/OrchardCore.Google/GoogleAuthenticationPermissionProvider.cs b/src/OrchardCore.Modules/OrchardCore.Google/GoogleAuthenticationPermissionProvider.cs
@@ -20,7 +20,7 @@ public IEnumerable<PermissionStereotype> GetDefaultStereotypes() =>
     [
         new PermissionStereotype
         {
-            Name = "Administrator",
+            Name = OrchardCoreConstants.Roles.Administrator,
             Permissions = _allPermissions,
         },
     ];

diff --git a/src/OrchardCore.Modules/OrchardCore.Google/GoogleTagManagerPermissionProvider.cs b/src/OrchardCore.Modules/OrchardCore.Google/GoogleTagManagerPermissionProvider.cs
@@ -20,7 +20,7 @@ public IEnumerable<PermissionStereotype> GetDefaultStereotypes() =>
     [
         new PermissionStereotype
         {
-            Name = "Administrator",
+            Name = OrchardCoreConstants.Roles.Administrator,
             Permissions = _allPermissions,
         },
     ];

diff --git a/src/OrchardCore.Modules/OrchardCore.Https/Permissions.cs b/src/OrchardCore.Modules/OrchardCore.Https/Permissions.cs
@@ -20,7 +20,7 @@ public IEnumerable<PermissionStereotype> GetDefaultStereotypes() =>
     [
         new PermissionStereotype
         {
-            Name = "Administrator",
+            Name = OrchardCoreConstants.Roles.Administrator,
             Permissions = _allPermissions,
         },
     ];

diff --git a/src/OrchardCore.Modules/OrchardCore.Indexing/Permissions.cs b/src/OrchardCore.Modules/OrchardCore.Indexing/Permissions.cs
@@ -20,7 +20,7 @@ public IEnumerable<PermissionStereotype> GetDefaultStereotypes() =>
     [
         new PermissionStereotype
         {
-            Name = "Administrator",
+            Name = OrchardCoreConstants.Roles.Administrator,
             Permissions = _allPermissions,
         },
     ];

diff --git a/src/OrchardCore.Modules/OrchardCore.Layers/Permissions.cs b/src/OrchardCore.Modules/OrchardCore.Layers/Permissions.cs
@@ -20,7 +20,7 @@ public IEnumerable<PermissionStereotype> GetDefaultStereotypes() =>
     [
         new PermissionStereotype
         {
-            Name = "Administrator",
+            Name = OrchardCoreConstants.Roles.Administrator,
             Permissions = _allPermissions,
         },
     ];

diff --git a/src/OrchardCore.Modules/OrchardCore.Localization/Permissions.cs b/src/OrchardCore.Modules/OrchardCore.Localization/Permissions.cs
@@ -26,7 +26,7 @@ public IEnumerable<PermissionStereotype> GetDefaultStereotypes() =>
     [
         new PermissionStereotype
         {
-            Name = "Administrator",
+            Name = OrchardCoreConstants.Roles.Administrator,
             Permissions = _allPermissions,
         },
     ];

diff --git a/src/OrchardCore.Modules/OrchardCore.Media.AmazonS3/Permissions.cs b/src/OrchardCore.Modules/OrchardCore.Media.AmazonS3/Permissions.cs
@@ -20,7 +20,7 @@ public IEnumerable<PermissionStereotype> GetDefaultStereotypes() =>
     [
         new PermissionStereotype
         {
-            Name = "Administrator",
+            Name = OrchardCoreConstants.Roles.Administrator,
             Permissions = _allPermissions,
         },
     ];