Changeset 4301

Timestamp:

10/27/2016 06:31:28 AM (10 years ago)

Author:

dd32

Message:

Plugin Directory: Add plugin committer management to the new plugin admin.

See #2111.

Location:

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

Files:

• api/class-base.php (modified) (1 diff)
• api/routes/class-plugin-committers.php (added)
• widgets/class-committers.php (modified) (3 diffs)
• widgets/class-contributors.php (modified) (1 diff)

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

@@ -21 +21 @@
                 new Routes\SVN_Access();
                 new Routes\Zip_Management();
+                new Routes\Plugin_Committers();
         }
 

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

@@ -39 +39 @@
                 <style>
                         <?php // TODO: Yes, these need to be moved into the CSS somewhere. ?>
-                        h3 a.addnew:before {
-                                content: '+';
-                        }
                         ul.committer-list {
                                 list-style: none;
@@ -53 +50 @@
                         ul.committer-list a.remove {
                                 color: red;
+                                cursor: pointer;
                                 visibility: hidden;
                         }
@@ -59 +57 @@
                         }
                 </style>
-                <h3><?php _e( 'Committers', 'wporg-plugins' ); ?> <a href="#" class="addnew"><?php _e( 'Add', 'wporg-plugins' ); ?></button></h3>
+
+                <h3><?php _e( 'Committers', 'wporg-plugins' ); ?></h3>
 
                 <ul class="committer-list">
                 <?php foreach ( $committers as $committer ) {
-                        echo '<li>' .
+                        echo '<li data-user="' . esc_attr( $committer->user_nicename ) . '">' .
                                 get_avatar( $committer->ID, 32 ) .
                                 '<a href="' . esc_url( 'https://profiles.wordpress.org/' . $committer->user_nicename ) . '">' . Template::encode( $committer->display_name ) . '</a>' .
-                                '<br><small>' . esc_html( $committer->user_email ) . ' ' .
-                                '<a href="#" class="remove">' . __( 'Remove', 'wporg-plugins' ) . '</a>' .
+                                '<br><small>' .
+                                ( current_user_can( 'plugin_review' ) ? esc_html( $committer->user_email ) . ' ' : '' ) .
+                                '<a class="remove">' . __( 'Remove', 'wporg-plugins' ) . '</a>' .
                                 '</small>' .
                                 '</li>';
                 } ?>
+                <li class="new" data-template="<?php echo esc_attr( '<li><img src="" class="avatar avatar-32 photo" height="32" width="32"><a class="profile" href=""></a><br><small><span class="email"></span> <a class="remove">' . __( 'Remove', 'wporg-plugins' ) . '</a></small></li>' ); ?>">
+                        <input type="text" name="committer" placeholder="<?php esc_attr_e( 'Login, Slug, or Email.', 'wporg-plugins' ); ?>">
+                        <input type="submit" value="<?php esc_attr_e( 'Add', 'wporg-plugins' ); ?>">
+                </li>
+
                 </ul>
+                <script>
+                        var rest_api_url = <?php echo wp_json_encode( get_rest_url() ); ?>,
+                                rest_api_nonce = <?php echo wp_json_encode( wp_create_nonce( 'wp_rest' ) ); ?>,
+                                plugin_slug = <?php echo wp_json_encode( $post->post_name ); ?>;
 
+                jQuery( 'ul.committer-list' ).on( 'click', 'a.remove', function(e) {
+                        e.preventDefault();
+
+                        var $this = jQuery( this ),
+                                $row = $this.parents('li'),
+                                user_nicename = $row.data( 'user' ),
+                                url = rest_api_url + 'plugins/v1/plugin/' + plugin_slug + '/committers/' + user_nicename + '/?_wpnonce=' + rest_api_nonce;
+
+                        jQuery.post({
+                                url: url,
+                                method: 'DELETE',
+                        }).success( function( result ) {
+                                if ( true === result ) {
+                                        $row.slideUp( 500, function() {
+                                                $row.remove();
+                                        } );
+                                } else {
+                                        alert( result.messsage );
+                                }
+                        } ).fail( function( result ) {
+                                result = jQuery.parseJSON( result.responseText );
+                                if ( typeof result.message !== undefined ) {
+                                        alert( result.message );
+                                }
+                        } );
+                } );
+
+                jQuery( 'ul.committer-list' ).on( 'click', 'li.new input[type="submit"]', function(e) {
+                        e.preventDefault();
+
+                        var $this = jQuery( this ),
+                                $row = $this.parents('li'),
+                                $list = $row.parents('ul'),
+                                $new_user_input = $row.find( 'input[name="committer"]' ),
+                                user_to_add = $new_user_input.val(),
+                                url = rest_api_url + 'plugins/v1/plugin/' + plugin_slug + '/committers/?_wpnonce=' + rest_api_nonce;
+
+                        jQuery.post({
+                                url: url,
+                                dataType: 'json',
+                                data: {
+                                        committer: user_to_add
+                                }
+                        }).done( function( result ) {
+                                if ( typeof result.name !== "undefined" ) {
+                                        $newrow = jQuery( $row.data('template') );
+                                        $newrow.data('user', result.nicename );
+                                        $newrow.find('img').attr( 'src', result.avatar );
+                                        $newrow.find('a.profile').attr('href', result.profile ).html( result.name );
+                                        if ( typeof result.email !== "undefined" ) {
+                                                $newrow.find('span.email').text( result.email );
+                                        }
+                                        $row.before( $newrow );
+                                        $new_user_input.val('');
+                                } else {
+                                        alert( result.messsage );
+                                }
+                        } ).fail( function( result ) {
+                                result = jQuery.parseJSON( result.responseText );
+                                if ( typeof result.message !== undefined ) {
+                                        alert( result.message );
+                                }
+                        } );
+                } );
+                        
+                </script>
 
                 <?php

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

@@ -29 +29 @@
                 $post = get_post();
 
-                $contributors = (array) wp_list_pluck( (array)get_the_terms( $post, 'plugin_contributors' ), 'name' );
-                $contributors = array_map( function( $user_nicename ) {
-                        return get_user_by( 'slug', $user_nicename );
-                }, $contributors );
+                if ( $contributors = get_the_terms( $post, 'plugin_contributors' ) ) {
+                        $contributors = (array) wp_list_pluck( $contributors, 'name' );
+                        $contributors = array_map( function( $user_nicename ) {
+                                return get_user_by( 'slug', $user_nicename );
+                        }, $contributors );
+                } else {
+                        return;
+                }
 
                 echo $args['before_widget'];