Merge branch...

Merge branch 'feature/ISTWCMS-6076-l26yan-Swap-the-order-content-author-and-content-editor-roles' into '1.1.x'

ISTWCMS-6076 Swap the order content author and content editor roles

See merge request !313

src/UwRoles/UwRoles.php

@@ -40,8 +40,8 @@ class UwRoles {
     return [
       'uw_role_site_owner',
       'uw_role_site_manager',
-      'uw_role_content_author',
       'uw_role_content_editor',
+      'uw_role_content_author',
       'uw_role_form_editor',
       'uw_role_form_results_access',
       'uw_role_private_content_viewer',
@@ -98,12 +98,12 @@ class UwRoles {
       case 'uw_role_site_manager':
         return 'Site manager';
 
-      case 'uw_role_content_author':
-        return 'Content author';
-
       case 'uw_role_content_editor':
         return 'Content editor';
 
+      case 'uw_role_content_author':
+        return 'Content author';
+
       case 'uw_role_form_editor':
         return 'Form editor';
 

uw_cfg_common.install

@@ -708,3 +708,22 @@ function uw_cfg_common_update_9106(&$sandbox) {
     }
   }
 }
+
+/**
+ * Swap the order of content author and editor roles.
+ */
+function uw_cfg_common_update_9107(&$sandbox) {
+  // The original weight of content editor role is 5.
+  // The original weight of content author role is 4.
+  $role_ids = [
+    'uw_role_content_editor' => 4,
+    'uw_role_content_author' => 5,
+  ];
+  // Set new weight of content editor role as 4.
+  // Set new weight of content author role as 5.
+  foreach ($role_ids as $role_id => $weight) {
+    $role = Role::load($role_id);
+    $role->setWeight($weight);
+    $role->save();
+  }
+}