Changeset 2752

Timestamp:

03/15/2016 08:02:51 PM (11 years ago)

Author:

obenland

Message:

Plugin Directory: Allow plugin committers to be added and removed.

Still needs cap checks.
Uses wpList to seemlessly add/remove committers. Works similar to the
category meta box.

See #1571.

Location:

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

Files:

• admin/class-committers-list-table.php (added)
• admin/class-customizations.php (modified) (4 diffs)
• admin/metabox/class-committers.php (modified) (2 diffs)
• admin/metabox/class-internal-notes.php (modified) (1 diff)
• css/edit-form.css (modified) (6 diffs)
• js/edit-form.js (modified) (3 diffs)

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

@@ -30 +30 @@
 
                 add_action( 'admin_enqueue_scripts', array( $this, 'enqueue_assets' ) );
+
                 add_action( 'wp_ajax_replyto-comment', array( $this, 'save_custom_comment' ), 0 );
-
-                add_filter( 'postbox_classes_plugin_internal-notes', array( $this, 'postbox_classes' ) );
                 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' ) );
+                add_filter( 'postbox_classes_plugin_plugin-committers', array( __NAMESPACE__ . '\Metabox\Committers',     'postbox_classes' ) );
+                add_filter( 'wp_ajax_add-committer',    array( __NAMESPACE__ . '\Metabox\Committers', 'add_committer'    ) );
+                add_filter( 'wp_ajax_delete-committer', array( __NAMESPACE__ . '\Metabox\Committers', 'remove_committer' ) );
         }
 
@@ -61 +65 @@
                 global $post_type;
 
-                if ( 'post.php' == $hook_suffix && 'plugin' == $post_type ) {
+                if ( 'post.php' === $hook_suffix && 'plugin' === $post_type ) {
                         wp_enqueue_style( 'plugin-admin-edit-css', plugins_url( 'css/edit-form.css', Plugin_Directory\PLUGIN_FILE ), array( 'edit' ), 1 );
-                        wp_enqueue_script( 'plugin-admin-edit-js', plugins_url( 'js/edit-form.js', Plugin_Directory\PLUGIN_FILE ), array( 'wp-util' ), 1 );
+                        wp_enqueue_script( 'plugin-admin-edit-js', plugins_url( 'js/edit-form.js', Plugin_Directory\PLUGIN_FILE ), array( 'wp-util', 'wp-lists' ), 1 );
+                        wp_localize_script( 'plugin-admin-edit-js', 'pluginDirectory', array(
+                                'removeCommitterAYS' => __( 'Are you sure you want to remove this committer?', 'wporg-plugins' ),
+                        ) );
                 }
         }
@@ -133 +140 @@
                         update_post_meta( $post_id, 'tested', wp_slash( wp_unslash( $_POST['tested_with'] ) ) );
                 }
-        }
-
-        /**
-         * Filters the postbox classes for custom comment meta boxes.
-         *
-         * @param array $classes An array of postbox classes.
-         * @return array
-         */
-        public function postbox_classes( $classes ) {
-                $classes[] = 'comments-meta-box';
-
-                return array_filter( $classes );
         }
 
@@ -160 +155 @@
          */
         public function custom_comment_row_actions( $actions, $comment ) {
-                if ( 'internal-note' === $comment->comment_type ) {
+                if ( 'internal-note' === $comment->comment_type && isset( $_REQUEST['mode'] ) && 'single' === $_REQUEST['mode'] ) {
                         $allowed_actions = array( 'reply' => true );
 

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

@@ -1 +1 @@
 <?php
 namespace WordPressdotorg\Plugin_Directory\Admin\Metabox;
-use WordPressdotorg\Plugin_Directory\Tools;
+use WordPressdotorg\Plugin_Directory\Admin\Committers_List_Table;
 
 /**
@@ -9 +9 @@
  */
 class Committers {
-        static function display() {
-                $plugin_slug         = get_post()->post_name;
-                $existing_committers = Tools::get_plugin_committers( $plugin_slug );
-                $existing_committers = array_map( function ( $user ) {
-                        return new \WP_User( $user );
-                }, $existing_committers );
 
-                $output = '';
-                foreach ( $existing_committers as $committer ) {
-                        $output .= sprintf(
-                                '<li title="%s"><span class="avatar">%s</span> %s</li>',
-                                esc_attr( $committer->user_login ),
-                                get_avatar( $committer, '24' ),
-                                esc_html( $committer->display_name )
-                        );
+        /**
+         * Filters the postbox classes for custom comment meta boxes.
+         *
+         * @param array $classes An array of postbox classes.
+         * @return array
+         */
+        public static function postbox_classes( $classes ) {
+                $classes[] = 'committers-meta-box';
+
+                return array_filter( $classes );
+        }
+
+        public static function display() {
+                $list = new Committers_List_Table();
+                $list->prepare_items();
+                $list->display();
+        }
+
+        public static function add_committer() {
+                check_ajax_referer( 'add-committer' );
+
+                $login   = isset( $_POST['add_committer'] ) ? sanitize_user( $_POST['add_committer'] ) : '';
+                $post_id = isset( $_POST['post_id'] ) ? (int) $_POST['post_id'] : 0;
+
+                if ( ! $committer = get_user_by( 'login', $login ) ) {
+                        wp_die( time() );
                 }
-                echo '<ul class="committers">' . $output . '</ul>';
+
+                if ( ! current_user_can( 'manage_committers', $post_id ) ) {
+                //      wp_die( -1 );
+                }
+                global $post, $wpdb;
+
+                $response = new \WP_Ajax_Response();
+                $post     = get_post( $post_id );
+
+                $result = $wpdb->insert( PLUGINS_TABLE_PREFIX . 'svn_access', array(
+                        'path'   => "/{$post->post_name}",
+                        'user'   => $login,
+                        'access' => 'rw',
+                ) );
+
+                if ( ! $result ) {
+                        $message = __( 'An error has occurred. Please reload the page and try again.' );
+                        if ( is_wp_error( $result ) && $result->get_error_message() ) {
+                                $message = $result->get_error_message();
+                        }
+
+                        $response->add( array(
+                                'what' => 'committer',
+                                'data' => new \WP_Error( 'error', $message ),
+                        ) );
+                        $response->send();
+                }
+
+                $wp_list_table = new Committers_List_Table();
+
+                $response->add( array(
+                        'what'     => 'committer',
+                        'id'       => $committer->ID,
+                        'data'     => $wp_list_table->single_row( $committer ),
+                        'position' => -1,
+                ) );
+                $response->send();
+        }
+
+        public static function remove_committer() {
+                $id      = isset( $_POST['id'] )      ? (int) $_POST['id']      : 0;
+                $post_id = isset( $_POST['post_id'] ) ? (int) $_POST['post_id'] : 0;
+
+                check_ajax_referer( "remove-committer-$id" );
+
+                if ( ! $committer = get_user_by( 'id', $id ) ) {
+                        wp_die( time() );
+                }
+
+                if ( ! current_user_can( 'manage_committers', $post_id ) ) {
+                //      wp_die( -1 );
+                }
+
+                $plugin_slug = get_post( $post_id )->post_name;
+
+                $result = $GLOBALS['wpdb']->delete( PLUGINS_TABLE_PREFIX . 'svn_access', array(
+                        'path'   => "/{$plugin_slug}",
+                        'user'   => $committer->user_login,
+                ) );
+
+                wp_die( $result );
         }
 }

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

@@ -11 +11 @@
 
         /**
+         * Filters the postbox classes for custom comment meta boxes.
+         *
+         * @param array $classes An array of postbox classes.
+         * @return array
+         */
+        public static function postbox_classes( $classes ) {
+                $classes[] = 'comments-meta-box';
+
+                return array_filter( $classes );
+        }
+
+        /**
          * Displays comment box for internal notes.
          */
-        static function display() {
+        public static function display() {
                 $wp_list_table = new Plugin_Comments_List_Table( array(
                         'comment_type' => 'internal-note',

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

@@ -20 +20 @@
         content: "\f173";
 }
+
 .misc-pub-section label[for="tested_with"]::before {
         content: "\f177";
@@ -33 +34 @@
 }
 
-.misc-pub-section .button-link {
+.button-link:not(.handlediv) {
         color: #0073aa;
         -webkit-transition-property: border, background, color;
@@ -41 +42 @@
         -webkit-transition-timing-function: ease-in-out;
         transition-timing-function: ease-in-out;
-    text-decoration: underline;
+        text-decoration: underline;
 }
 
-.misc-pub-section .button-link:hover,
-.misc-pub-section .button-link:active {
+.button-link:not(.handlediv):hover,
+.button-link:not(.handlediv):active {
         color: #00a0d2;
 }
@@ -67 +68 @@
 }
 
-.comments-meta-box.postbox .inside,
+#poststuff .comments-meta-box.postbox .inside,
+#poststuff .committers-meta-box.postbox .inside,
 .comments-meta-box .column-comment p {
         margin: 0;
         padding: 0;
+        border: 0;
 }
 
 .comments-meta-box .inside .row-actions {
         line-height:18px;
+}
+
+.comments-meta-box .inside .column-author {
+        width: 20%;
 }
 
@@ -90 +97 @@
 }
 
-.comments-meta-box .comments-box {
+.comments-meta-box .comments-box,
+.committers-meta-box .wp-list-table {
         border: 0 none;
 }
@@ -124 +132 @@
         }
 }
+
+/* Committers meta box */
+.add-committer {
+        padding: 0 12px 12px;
+}
+
+.add-committer .button-link {
+        font-weight: 600;
+        margin: 10px 0;
+}
+
+.add-committer input[type="text"] {
+        margin: 0 0 1em;
+        max-width: 260px;
+        vertical-align: baseline;
+        width: 100%;
+}

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

@@ -3 +3 @@
  */
 
-( function( $, wp ) {
+( function( $, wp, pluginDirectory ) {
         var PluginEdit = {
                 $testedWith: {},
@@ -22 +22 @@
                         _.each( $( '#post-body' ).find( '.comments-box' ), PluginEdit.loadComments );
 
-                        $( '#add-new-comment' ).on( 'click', 'a.button', function( event ) {
-                                event.preventDefault();
+                        $( '#add-new-comment' ).on( 'click', 'a.button', PluginEdit.prepareCommentForm );
 
-                                window.commentReply && commentReply.addcomment( $( '#post_ID' ).val() );
+                        $( '#add-committer-toggle' ).on( 'click', PluginEdit.toggleCommitterForm );
 
-                                $( '#replyrow' ).find( '.comment-reply' ).append( $( '<input/>' ).attr({
-                                        type: 'hidden',
-                                        name: 'comment_type',
-                                        value: $( '.comments-box' ).data( 'comment-type' )
-                                }) );
+                        $( '#the-committer-list' ).wpList({
+                                alt: false,
+                                confirm: function( element, settings, action ) {
+                                        if ( 'committer' === settings.what && 'delete' === action ) {
+                                                return confirm( pluginDirectory.removeCommitterAYS );
+                                        }
+                                        return true;
+                                }
+                        }).on( 'wpListAddEnd', function() {
+                                $( 'input[name="add_committer"]', '#add-committer' ).val( '' ).focus();
                         } );
                 },
@@ -93 +97 @@
                                 }
                         } );
+                },
+
+                prepareCommentForm: function( event ) {
+                        event.preventDefault();
+
+                        window.commentReply && commentReply.addcomment( $( '#post_ID' ).val() );
+
+                        // Add a field with the custom comment type.
+                        $( '#replyrow' ).find( '.comment-reply' ).append( $( '<input/>' ).attr({
+                                type: 'hidden',
+                                name: 'comment_type',
+                                value: $( '.comments-box' ).data( 'comment-type' )
+                        }) );
+                },
+
+                toggleCommitterForm: function( event ) {
+                        var $form = $( '#add-committer' );
+
+                        // Show/hide form.
+                        $form.toggleClass( 'wp-hidden-children' );
+
+                        // Focus on the input field, and on enter add the committer, don't save post.
+                        $( 'input[name="add_committer"]', $form ).focus().on( 'keydown', function( event ) {
+                                if ( 13 === event.which ) {
+                                        event.preventDefault();
+                                        $( '#add-committer-submit', $form ).click();
+                                }
+                        } );
                 }
         };
 
         $( PluginEdit.ready );
-} )( window.jQuery, window.wp );
+} )( window.jQuery, window.wp, window.pluginDirectory );