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

Timestamp:

11/11/2015 02:00:12 AM (9 years ago)

Author:

dd32

Message:

Translate: Add a basic sorting dropdown to project views.
Patches welcome to integrate the UI into the listing UI better.

Fixes #1122

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

@@ -26 +26 @@
         $page = (int) gp_get( 'page', 1 );
         $search = gp_get( 's', '' );
-        $filter = gp_get( 'filter', 'default' );
+        $filter = gp_get( 'filter', false );
 
         $locale = GP_Locales::by_slug( $locale_slug );
@@ -88 +88 @@
         $sub_projects = $paged_sub_projects['projects'];
         $pages        = $paged_sub_projects['pages'];
+        $filter       = $paged_sub_projects['filter'];
         unset( $paged_sub_projects );
 
@@ -386 +387 @@
             'set_slug' => '',
             'locale'   => '',
-            'filter'     => 'default',
+            'filter'   => false,
         );
         $r = wp_parse_args( $args, $defaults );
@@ -408 +409 @@
         if ( 'waiting' == $project->slug && GP::$user->current()->id && isset( GP::$plugins->wporg_rosetta_roles ) ) {
 
-            if ( 'default' === $filter ) {
-                $filter = 'strings-waiting';
+            if ( ! $filter ) {
+                $filter = 'strings-waiting-and-fuzzy';
             }
 
@@ -452 +453 @@
 
         $filter_order_by = $filter_where = '';
-        switch ( $filter ) {
+        $sort_order = 'DESC';
+        $filter_name = $filter;
+        if ( $filter && '-asc' == substr( $filter, -4 ) ) {
+            $sort_order = 'ASC';
+            $filter_name = substr( $filter, 0, -4 );
+        }
+        switch ( $filter_name ) {
             default:
-            case 'default':
+            case 'special':
                 // Float favorites to the start, but only if they have untranslated strings
                 $user_fav_projects = array_map( array( $gpdb, 'escape' ), $this->get_user_favorites( $project->slug ) );
@@ -481 +488 @@
             case 'strings-remaining':
                 $filter_where = 'AND stats.untranslated > 0';
-                $filter_order_by = 'stats.untranslated DESC, tp.name ASC';
+                $filter_order_by = "stats.untranslated $sort_order, tp.name ASC";
                 break;
 
-            case 'strings-waiting':
+            case 'strings-waiting-and-fuzzy':
                 $filter_where = 'AND (stats.waiting > 0 OR stats.fuzzy > 0 )';
                 $filter_order_by = "tp.path LIKE 'wp/%%' AND (stats.fuzzy + stats.waiting) > 0 DESC, (stats.fuzzy + stats.waiting) DESC, tp.name ASC";
                 break;
 
-            case 'strings-fuzzy-and-warnings':
-                $filter_where = 'AND ( stats.fuzzy > 0 OR stats.warnings > 0 )';
-                $filter_order_by = '(stats.fuzzy+stats.warnings) DESC, tp.name ASC';
-                break;
-
             case 'percent-completed':
                 $filter_where = 'AND stats.untranslated > 0';
-                $filter_order_by = ' ( stats.current / stats.all ) DESC, tp.name ASC';
+                $filter_order_by = "( stats.current / stats.all ) $sort_order, tp.name ASC";
                 break;
         }
@@ -534 +536 @@
             'pages' => compact( 'pages', 'page', 'per_page', 'results' ),
             'projects' => $projects,
+            'filter' => $filter,
         );
     }