Changeset 1780

Timestamp:

07/23/2015 10:43:49 AM (9 years ago)

Author:

ocean90

Message:

Translate: Show only active top level projects in the filter bar.

see #1091.

File:

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

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

@@ -69 +69 @@
         }
 
-        $top_level_projects = GP::$project->top_level();
+        $top_level_projects = $this->get_active_top_level_projects();
         usort( $top_level_projects, array( $this, '_sort_reverse_name_callback' ) );
 
@@ -199 +199 @@
         global $gpdb;
 
-        $table = GP::$translation_set->table;
         $project_ids = implode( ',', $project_ids );
         $slugs = $gpdb->get_col( $gpdb->prepare( "
             SELECT DISTINCT(slug), name
-            FROM $table
+            FROM {$gpdb->translation_sets}
             WHERE
                 project_id IN( $project_ids )
@@ -278 +277 @@
      */
     private function get_active_sub_projects( $project, $with_sub_projects = false ) {
+        global $gpdb;
+
         $_projects = $project->many( "
             SELECT *
-            FROM $project->table
+            FROM {$gpdb->projects}
             WHERE
                 parent_project_id = %d AND
@@ -295 +296 @@
                 $sub_projects = $project->many( "
                     SELECT *
-                    FROM $project->table
+                    FROM {$gpdb->projects}
                     WHERE
                         parent_project_id = %d AND
@@ -367 +368 @@
          * If not, we can simply filter them out, so that paging only has items returned that actually exist.
          */
-        $translation_sets_table = GP::$translation_set->table;
         $_projects = $project->many( "
             SELECT SQL_CALC_FOUND_ROWS tp.*
-                FROM {$project->table} tp
-                LEFT JOIN {$project->table} tp_sub ON tp.id = tp_sub.parent_project_id AND tp_sub.active = 1
-                LEFT JOIN {$translation_sets_table} sets ON sets.project_id = tp.id AND sets.locale = %s AND sets.slug = %s
-                LEFT JOIN {$translation_sets_table} sets_sub ON sets_sub.project_id = tp_sub.id AND sets_sub.locale = %s AND sets_sub.slug = %s
+                FROM {$gpdb->projects} tp
+                LEFT JOIN {$gpdb->projects} tp_sub ON tp.id = tp_sub.parent_project_id AND tp_sub.active = 1
+                LEFT JOIN {$gpdb->translation_sets} sets ON sets.project_id = tp.id AND sets.locale = %s AND sets.slug = %s
+                LEFT JOIN {$gpdb->translation_sets} sets_sub ON sets_sub.project_id = tp_sub.id AND sets_sub.locale = %s AND sets_sub.slug = %s
             WHERE
                 tp.parent_project_id = %d
@@ -385 +385 @@
 
         $results = (int) $project->found_rows();
-        $pages = (int)ceil( $results / $per_page );
+        $pages = (int) ceil( $results / $per_page );
 
         $projects = array();
@@ -398 +398 @@
     }
 
+    /**
+     * Retrieves active top level projects.
+     *
+     * @return array List of top level projects.
+     */
+    public function get_active_top_level_projects() {
+        global $gpdb;
+
+        return GP::$project->many( "
+            SELECT *
+            FROM {$gpdb->projects}
+            WHERE
+                parent_project_id IS NULL
+                AND active = 1
+            ORDER BY name ASC
+        " );
+    }
+
     private function _sort_reverse_name_callback( $a, $b ) {
         return - strcasecmp( $a->name, $b->name );