Changeset 4083

Timestamp:

09/16/2016 08:56:17 PM (10 years ago)

Author:

ocean90

Message:

Translate, Rosetta Roles: Add support for the new locale manager role.

See #1398.

Location:

sites/trunk/wordpress.org/public_html/wp-content/plugins

Files:

• wporg-gp-rosetta-roles/inc/class-plugin.php (modified) (4 diffs)
• wporg-gp-routes/inc/routes/class-locale.php (modified) (1 diff)

sites/trunk/wordpress.org/public_html/wp-content/plugins/wporg-gp-rosetta-roles/inc/class-plugin.php

@@ -29 +29 @@
          */
         const GENERAL_TRANSLATION_EDITOR_ROLE = 'general_translation_editor';
+
+        /**
+         * Role of a locale manager.
+         */
+        const LOCALE_MANAGER_ROLE = 'locale_manager';
 
         /**
@@ -102 +107 @@
 
                 // Simple check to see if they're an approver or not.
-                if ( ! $this->is_approver_for_locale( $args['user_id'], $locale_slug ) ) {
-                        return false;
+                $role = $this->is_approver_for_locale( $args['user_id'], $locale_slug );
+                if ( ! $role ) {
+                        return false;
+                }
+
+                // Locale managers are allowed to approve all projects.
+                if ( self::LOCALE_MANAGER_ROLE === $role ) {
+                        return true;
                 }
 
@@ -170 +181 @@
          * @param int    $user_id     User ID.
          * @param string $locale_slug The Locale for which we are checking.
-         * @return bool True, if user is an approver, false if not.
+         * @return false|string Role, if user is an approver, false if not.
          */
         public function is_approver_for_locale( $user_id, $locale_slug ) {
@@ -202 +213 @@
 
                 $capabilities = $user->{$cap_key};
-                $is_approver = ! empty( $capabilities[ self::TRANSLATION_EDITOR_ROLE ] ) || ! empty( $capabilities[ self::GENERAL_TRANSLATION_EDITOR_ROLE ] );
-                $cache[ $user_id ][ $locale_slug ] = $is_approver;
-
-                return $is_approver;
+
+                if ( ! empty( $capabilities[ self::LOCALE_MANAGER_ROLE ] ) ) {
+                        $cache[ $user_id ][ $locale_slug ] = self::LOCALE_MANAGER_ROLE;
+                        return self::LOCALE_MANAGER_ROLE;
+                } elseif ( ! empty( $capabilities[ self::GENERAL_TRANSLATION_EDITOR_ROLE ] ) ) {
+                        $cache[ $user_id ][ $locale_slug ] = self::GENERAL_TRANSLATION_EDITOR_ROLE;
+                        return self::GENERAL_TRANSLATION_EDITOR_ROLE;
+                } elseif ( ! empty( $capabilities[ self::TRANSLATION_EDITOR_ROLE ] ) ) {
+                        $cache[ $user_id ][ $locale_slug ] = self::TRANSLATION_EDITOR_ROLE;
+                        return self::TRANSLATION_EDITOR_ROLE;
+                } else {
+                        $cache[ $user_id ][ $locale_slug ] = false;
+                        return false;
+                }
         }
 

sites/trunk/wordpress.org/public_html/wp-content/plugins/wporg-gp-routes/inc/routes/class-locale.php

@@ -594 +594 @@
                         // Check to see if they have any special approval permissions
                         $allowed_projects = array();
-                        if ( ! $can_approve_for_all && $this->roles_adapter->is_approver_for_locale( $user_id, $locale ) ) {
+                        if ( ! $can_approve_for_all && $role = $this->roles_adapter->is_approver_for_locale( $user_id, $locale ) ) {
                                 $allowed_projects = $this->roles_adapter->get_project_id_access_list( $user_id, $locale, true );
 
                                 // Check to see if they can approve for all projects in this locale.
-                                if ( in_array( 'all', $allowed_projects ) ) {
+                                if ( Rosetta_Roles::LOCALE_MANAGER_ROLE === $role || in_array( 'all', $allowed_projects ) ) {
                                         $can_approve_for_all = true;
                                         $allowed_projects = array();