Changeset 3095

Timestamp:

05/06/2016 10:17:09 PM (9 years ago)

Author:

obenland

Message:

Plugin Directory: Show banners to provide a clearer status for plugins.

Redirects users who can edit a particular plugin that is closed or disabled
from the front-end to the edit page of that plugin and adds admin notices to
give more context about the current status of a plugin.

Fixes #1689.

Location:

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

Files:

• admin/class-customizations.php (modified) (2 diffs)
• class-plugin-directory.php (modified) (2 diffs)

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

@@ -25 +25 @@
      */
     private function __construct() {
+        add_filter( 'dashboard_glance_items', array( $this, 'plugin_glance_items' ) );
+
+        add_action( 'pre_get_posts', array( $this, 'pre_get_posts' ) );
+        add_action( 'save_post_plugin', array( $this, 'save_plugin_post' ) );
+
+        add_action( 'admin_enqueue_scripts', array( $this, 'enqueue_assets' ) );
+        add_filter( 'admin_head-edit.php', array( $this, 'plugin_posts_list_table' ) );
+        add_action( 'admin_notices', array( $this, 'add_post_status_notice' ) );
+        add_action( 'all_admin_notices', array( $this, 'admin_notices' ) );
+        add_filter( 'display_post_states', array( $this, 'post_states' ), 10, 2 );
+
+        add_action( 'wp_ajax_replyto-comment', array( $this, 'save_custom_comment' ), 0 );
+        add_filter( 'comment_row_actions', array( $this, 'custom_comment_row_actions' ), 10, 2 );
+
         // Admin Metaboxes
         add_action( 'add_meta_boxes', array( $this, 'register_admin_metaboxes' ), 10, 2 );
         add_action( 'do_meta_boxes', array( $this, 'replace_title_global' ) );
-        add_filter( 'dashboard_glance_items', array( $this, 'plugin_glance_items' ) );
-
-        add_action( 'pre_get_posts', array( $this, 'pre_get_posts' ) );
-        add_action( 'save_post_plugin', array( $this, 'save_plugin_post' ) );
-
-        add_action( 'admin_enqueue_scripts', array( $this, 'enqueue_assets' ) );
-        add_filter( 'admin_head-edit.php', array( $this, 'plugin_posts_list_table' ) );
-        add_filter( 'display_post_states', array( $this, 'post_states' ), 10, 2 );
-
-        add_action( 'wp_ajax_replyto-comment', array( $this, 'save_custom_comment' ), 0 );
-        add_filter( 'comment_row_actions', array( $this, 'custom_comment_row_actions' ), 10, 2 );
 
         add_filter( 'postbox_classes_plugin_internal-notes',    array( __NAMESPACE__ . '\Metabox\Internal_Notes', 'postbox_classes' ) );
@@ -221 +224 @@
             $wp_list_table->prepare_items();
         }
+    }
+
+    /**
+     * Adds banners to provide a clearer status for a plugin.
+     *
+     * This is being displayed in the edit screen for a particular plugin,
+     * providing more context about the current status of a plugin for both
+     * Committers and Reviewers/Admins.
+     */
+    public function add_post_status_notice() {
+        if ( 'post.php' !== $GLOBALS['pagenow'] ) {
+            return;
+        }
+
+        $message  = '';
+        $post     = get_post();
+        $is_admin = current_user_can( 'plugin_approve' );
+
+        switch ( $post->post_status ) {
+            case 'draft':
+            case 'pending':
+                $message = __( 'This plugin is requested and not visible to the public yet.', 'wporg-plugins' );
+                if ( ! $is_admin ) {
+                    $message .= ' ' . __( 'Please be patient as your plugin gets reviewed.', 'wporg-plugins' );
+                }
+                break;
+
+            case 'rejected':
+                $message = __( 'This plugin is rejected and is not visible to the public.', 'wporg-plugins' );
+                break;
+
+            case 'approved':
+                $message = __( 'This plugin is approved and awaiting data upload but not visible to the public yet.', 'wporg-plugins' );
+                if ( ! $is_admin ) {
+                    $message .= ' ' . __( 'Once you make your first commit, the plugin will become public.', 'wporg-plugins' );
+                }
+                break;
+
+            case 'closed':
+                $message = __( 'This plugin is closed and is not visible to the public.', 'wporg-plugins' );
+                break;
+
+            case 'disabled':
+                $message = __( 'This plugin is closed and is not visible to the public.', 'wporg-plugins' );
+                if ( $is_admin ) {
+                    $message = __( 'This plugin is disabled (closed, but actively serving updates) and is not visible to the public.', 'wporg-plugins' );
+                }
+                break;
+        }
+
+        if ( $message ) {
+            add_settings_error( 'wporg-plugins', 'status-notice', $message, 'updated' );
+        }
+    }
+
+    /**
+     * Displays all admin notices registered to `wporg-plugins`.
+     */
+    public function admin_notices() {
+        settings_errors( 'wporg-plugins' );
     }
 

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

@@ -29 +29 @@
         add_filter( 'rest_api_allowed_post_types', array( $this, 'filter_allowed_post_types' ) );
         add_filter( 'pre_update_option_jetpack_options', array( $this, 'filter_jetpack_options' ) );
-
-        add_filter( 'map_meta_cap', array( __NAMESPACE__ . '\Capabilities', 'map_meta_cap' ), 10, 4 );
+        add_action( 'template_redirect', array( $this, 'redirect_hidden_plugins' ) );
 
         // Shim in postmeta support for data which doesn't yet live in postmeta
         add_filter( 'get_post_metadata', array( $this, 'filter_shim_postmeta' ), 10, 3 );
+
+        add_filter( 'map_meta_cap', array( __NAMESPACE__ . '\Capabilities', 'map_meta_cap' ), 10, 4 );
 
         // Load the API routes
@@ -434 +435 @@
     }
 
+    /**
+     * Redirects Committers and Admins to a plugin's edit page if it's disabled or closed.
+     */
+    public function redirect_hidden_plugins() {
+        if ( ! is_404() ) {
+            return;
+        }
+
+        $post = self::get_plugin_post( get_query_var( 'name', false ) );
+
+        if ( $post instanceof \WP_Post && in_array( $post->post_status, array( 'disabled', 'closed' ), true ) && current_user_can( 'edit_post', $post ) ) {
+            wp_safe_redirect( add_query_arg( array( 'post' => $post->ID, 'action' => 'edit' ), admin_url( 'post.php' ) ) );
+        }
+    }
 
     /**