Changeset 8496

Timestamp:

03/24/2019 03:15:29 PM (6 years ago)

Author:

ocean90

Message:

Translate: Add a filter to limit waiting view to projects without an assigned editor.

Fixes #3586.

Location:

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

Files:

• wporg-gp-customizations/templates/locale-projects.php (modified) (2 diffs)
• wporg-gp-customizations/templates/style.css (modified) (1 diff)
• wporg-gp-routes/inc/routes/class-locale.php (modified) (6 diffs)

sites/trunk/wordpress.org/public_html/wp-content/plugins/wporg-gp-customizations/templates/locale-projects.php

@@ -86 +86 @@
 <div class="sort-bar">
     <form id="sort-filter" action="" method="GET">
+        <input type="hidden" name="s" value="<?php echo esc_attr( $search ?? '' ); ?>"
         <input type="hidden" name="page" value="1">
+
+        <?php if ( 'waiting' === $project->slug && is_user_logged_in() ) { ?>
+            <input id="filter-without-editors" type="checkbox" name="without-editors" value="1"<?php checked( isset( $_GET['without-editors'] ) ); ?>>
+            <label for="filter-without-editors">Limit to projects without editors</label>
+            <span class="filter-sep" aria-hidden="true">|</span>
+        <?php } ?>
+
+        <label for="filter">Filter:</label>
         <select id="filter" name="filter">
             <?php
@@ -111 +120 @@
             ?>
         </select>
+        <button type="submit">Submit</button>
     </form>
 </div>
-<script>
-    var filterForm  = document.getElementById( 'sort-filter' );
-    var filterSelect = document.getElementById( 'filter' );
-    filterSelect.addEventListener( 'change', function() {
-        filterForm.submit()
-    } );
-</script>
-
 <div id="projects" class="projects">
     <?php

sites/trunk/wordpress.org/public_html/wp-content/plugins/wporg-gp-customizations/templates/style.css

@@ -1428 +1428 @@
     border: 1px solid #dfdfdf;
     border-top: none;
+}
+
+.sort-bar label {
+    font-size: 12px;
+    line-height: 14px;
+}
+
+.sort-bar .filter-sep {
+    color: #ccc;
 }
 

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

@@ -47 +47 @@
         $search = gp_get( 's', '' );
         $filter = gp_get( 'filter', false );
+        $without_editors = gp_get( 'without-editors', false );
 
         $locale = GP_Locales::by_slug( $locale_slug );
@@ -100 +101 @@
                 'search' => $search,
                 'filter' => $filter,
+                'without_editors' => $without_editors,
                 'set_slug' => $set_slug,
                 'locale' => $locale_slug,
@@ -698 +700 @@
 
         $defaults = array(
-            'per_page' => 20,
-            'page'     => 1,
-            'search'   => false,
-            'set_slug' => '',
-            'locale'   => '',
-            'filter'   => false,
+            'per_page'        => 20,
+            'page'            => 1,
+            'search'          => false,
+            'set_slug'        => '',
+            'locale'          => '',
+            'filter'          => false,
+            'without_editors' => false,
         );
         $r = wp_parse_args( $args, $defaults );
@@ -744 +747 @@
             // Check to see if they have any special approval permissions.
             $allowed_projects = array();
+            $allowed_base_level_projects = array();
             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 );
@@ -761 +765 @@
                 $parent_project_sql = 'AND ( stats.waiting > 0 OR stats.fuzzy > 0 )';
                 $parent_project_sql .= $base_level_project_sql;
-
             } elseif ( $allowed_projects || $allowed_base_level_projects ) {
-                $parent_project_sql = 'AND stats.waiting > 0 AND ( (';
+                $parent_project_sql = 'AND ( stats.waiting > 0 OR stats.fuzzy > 0 ) AND ( (';
 
                 if ( $allowed_projects ) {
@@ -795 +798 @@
                 $parent_project_sql = 'AND 0=1';
 
+            }
+
+            // Exclude projects which have an assigned editor.
+            if ( $without_editors ) {
+                $project_ids_with_editor = $wpdb->get_col( $wpdb->prepare(
+                    "SELECT DISTINCT(project_id) FROM `translate_translation_editors` WHERE (locale = %s OR locale = 'all-locales') AND project_id != 0 AND user_id != %d",
+                    $locale,
+                    $user_id
+                ) );
+                if ( $project_ids_with_editor ) {
+                    $project_ids_with_editor = implode( ', ', array_map( 'intval', $project_ids_with_editor ) );
+                    $parent_project_sql .= " AND tp.id NOT IN( $project_ids_with_editor )";
+                }
             }
         }