Changeset 1839

Timestamp:

08/20/2015 02:04:27 AM (9 years ago)

Author:

dd32

Message:

Translate: Fix non-translation-editors from being able to view non-wp project tabs.

File:

• sites/trunk/translate.wordpress.org/includes/gp-plugins/wporg-routes/routes/locale.php (modified) (4 diffs)

sites/trunk/translate.wordpress.org/includes/gp-plugins/wporg-routes/routes/locale.php

@@ -14 +14 @@
      * @param string $project_path     Path of a project.
      */
-    public function get_locale_projects( $locale_slug, $set_slug = 'default', $project_path = 'waiting' ) {
+    public function get_locale_projects( $locale_slug, $set_slug = 'default', $project_path = false ) {
         global $gpdb;
 
@@ -31 +31 @@
         usort( $top_level_projects, array( $this, '_sort_reverse_name_callback' ) );
 
-        // Filter out the Waiting Tab if the current user cannot validate strings
+        // Default to the Waiting or WordPress tabs
+        $default_project_tab = 'waiting';
         $user = GP::$user->current();
         if (
@@ -39 +40 @@
                 GP::$plugins->wporg_rosetta_roles->is_global_administrator( $user->id ) || // Not a global admin
                 GP::$plugins->wporg_rosetta_roles->is_approver_for_locale( $user->id, $locale_slug ) // Doesn't have project-level access either
-            ) ) { // Add check to see if there are any waiting translations for this locale?
+            )
+            // Add check to see if there are any waiting translations for this locale?
+            ) {
+            $default_project_tab = 'wp';
+        }
+
+        // Filter out the Waiting Tab if the current user cannot validate strings
+        if ( 'waiting' != $default_project_tab ) {
             foreach ( $top_level_projects as $i => $project ) {
                 if ( 'waiting' == $project->slug ) {
@@ -46 +54 @@
                 }
             }
-
-            // Reset to default path of wp if the Waiting tab shouldn't be shown for this user.
-            $project_path = 'wp';
-        }
+        }
+
+        $project_path = $project_path ?: $default_project_tab;
 
         $project = GP::$project->by_path( $project_path );