Changeset 2790

Timestamp:

03/24/2016 06:36:48 PM (9 years ago)

Author:

obenland

Message:

Plugin Directory: Don't show review tools to Plugin Committers.

See #1570, #1571.

Location:

sites/trunk/wordpress.org/public_html/wp-content/plugins/plugin-directory/admin

Files:

• class-customizations.php (modified) (3 diffs)
• metabox/class-controls.php (modified) (2 diffs)

sites/trunk/wordpress.org/public_html/wp-content/plugins/plugin-directory/admin/class-customizations.php

@@ -100 +100 @@
 
     /**
-     * Filter the query in wp-admin to list only 
+     * Filter the query in wp-admin to list only.
      */
     public function pre_get_posts( $query ) {
@@ -181 +181 @@
         }
 
-        add_meta_box(
-            'plugin-committers',
-            __( 'Plugin Committers', 'wporg-plugins' ),
-            array( __NAMESPACE__ . '\Metabox\Committers', 'display' ),
-            'plugin', 'side'
-        );
-
-        add_meta_box(
-            'internal-notes',
-            __( 'Internal Notes', 'wporg-plugins' ),
-            array( __NAMESPACE__ . '\Metabox\Internal_Notes', 'display' ),
-            'plugin', 'normal', 'high'
-        );
-
-        add_meta_box(
-            'plugin-review',
-            __( 'Plugin Review Tools', 'wporg-plugins' ),
-            array( __NAMESPACE__ . '\Metabox\Review_Tools', 'display' ),
-            'plugin', 'normal', 'high'
-        );
+        // Only plugin reviewers/admins need review-related meta boxes.
+        if ( current_user_can( 'plugin_approve' ) ) {
+            add_meta_box(
+                'internal-notes',
+                __( 'Internal Notes', 'wporg-plugins' ),
+                array( __NAMESPACE__ . '\Metabox\Internal_Notes', 'display' ),
+                'plugin', 'normal', 'high'
+            );
+
+            add_meta_box(
+                'plugin-review',
+                __( 'Plugin Review Tools', 'wporg-plugins' ),
+                array( __NAMESPACE__ . '\Metabox\Review_Tools', 'display' ),
+                'plugin', 'normal', 'high'
+            );
+        }
 
         add_meta_box(
@@ -215 +211 @@
             array( __NAMESPACE__ . '\Metabox\Controls', 'display' ),
             'plugin', 'side', 'high'
+        );
+
+        add_meta_box(
+            'plugin-committers',
+            __( 'Plugin Committers', 'wporg-plugins' ),
+            array( __NAMESPACE__ . '\Metabox\Committers', 'display' ),
+            'plugin', 'side'
         );
 

sites/trunk/wordpress.org/public_html/wp-content/plugins/plugin-directory/admin/metabox/class-controls.php

@@ -18 +18 @@
                 self::display_post_status();
 
-                if ( 'publish' == get_post_status() ) {
+                if ( 'publish' === get_post_status() ) {
                     self::display_tested_up_to();
                 }
@@ -36 +36 @@
         $post = get_post();
 
+        // Bail if the current user can't review plugins.
+        if ( ! current_user_can( 'plugin_approve', $post ) ) {
+            return;
+        }
+
         $statuses = array( 'publish', 'pending', 'disabled', 'closed', 'rejected' );
-        // TODO Add capability check here
         ?>
         <div class="misc-pub-section misc-pub-plugin-status">