Changeset 2753

Timestamp:

03/15/2016 09:11:27 PM (9 years ago)

Author:

obenland

Message:

Plugin Directory: After [2752], improve error handling and docs.

See #1571.

Location:

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

Files:

• admin/class-committers-list-table.php (modified) (1 diff)
• admin/metabox/class-committers.php (modified) (6 diffs)
• css/edit-form.css (modified) (1 diff)
• js/edit-form.js (modified) (2 diffs)

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

@@ -122 +122 @@
                 <p class="wp-hidden-child">
                     <?php wp_nonce_field( 'add-committer', '_ajax_nonce', false ); ?>
+                    <span id="committer-error" class="notice notice-alt notice-error" style="display:none;"></span>
                     <input type="text" name="add_committer" class="form-required" value="" aria-required="true">
                     <input type="button" id="add-committer-submit" class="button" data-wp-lists="add:the-committer-list:add-committer::post_id=<?php echo get_post()->ID; ?>" value="<?php _e( 'Add Committer', 'wporg-plugins' ); ?>">

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

@@ -22 +22 @@
     }
 
+    /**
+     * Displays a list of committers for the current plugin.
+     */
     public static function display() {
         $list = new Committers_List_Table();
@@ -28 +31 @@
     }
 
+    /**
+     * Ajax handler for adding a new committer.
+     */
     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;
+        $login    = isset( $_POST['add_committer'] ) ? sanitize_user( $_POST['add_committer'] ) : '';
+        $post_id  = isset( $_POST['post_id'] ) ? (int) $_POST['post_id'] : 0;
+        $response = new \WP_Ajax_Response();
 
         if ( ! $committer = get_user_by( 'login', $login ) ) {
-            wp_die( time() );
+            $response->add( array(
+                'what' => 'committer',
+                'data' => new \WP_Error( 'error', sprintf( __( 'The user %s does not exist.', 'wporg-plugins' ), '<code>' . $login . '</code>' ) ),
+            ) );
+            $response->send();
         }
 
-        if ( ! current_user_can( 'manage_committers', $post_id ) ) {
-        //  wp_die( -1 );
+        // @todo: Capabilities.
+        if ( ! current_user_can( 'add_committers', $post_id ) ) {
+            //  wp_die( -1 );
         }
         global $post, $wpdb;
 
-        $response = new \WP_Ajax_Response();
-        $post     = get_post( $post_id );
-
+        $post   = get_post( $post_id );
         $result = $wpdb->insert( PLUGINS_TABLE_PREFIX . 'svn_access', array(
             'path'   => "/{$post->post_name}",
@@ -51 +61 @@
             '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();
+            if ( 'Duplicate entry' === substr( $wpdb->last_error, 0, 15 ) ) {
+                $message = __( 'Duplicate committer detected.', 'wporg-plugins' );
+            } else {
+                $message = __( 'An error has occurred. Please reload the page and try again.', 'wporg-plugins' );
             }
 
@@ -76 +86 @@
     }
 
+    /**
+     * Ajax handler for removing a committer.
+     */
     public static function remove_committer() {
         $id      = isset( $_POST['id'] )      ? (int) $_POST['id']      : 0;
@@ -82 +95 @@
         check_ajax_referer( "remove-committer-$id" );
 
+        $response = new \WP_Ajax_Response();
+
         if ( ! $committer = get_user_by( 'id', $id ) ) {
-            wp_die( time() );
+            $response->add( array(
+                'what' => 'committer',
+                'data' => new \WP_Error( 'error', sprintf( __( 'The user %s does not exist.', 'wporg-plugins' ), '<code>' . $login . '</code>' ) ),
+            ) );
+            $response->send();
         }
 
-        if ( ! current_user_can( 'manage_committers', $post_id ) ) {
-        //  wp_die( -1 );
+        // @todo: Capabilities.
+        if ( ! current_user_can( 'remove_committers', $post_id ) ) {
+            //  wp_die( -1 );
         }
 
@@ -93 +113 @@
 
         $result = $GLOBALS['wpdb']->delete( PLUGINS_TABLE_PREFIX . 'svn_access', array(
-            'path'   => "/{$plugin_slug}",
-            'user'   => $committer->user_login,
+            'path' => "/{$plugin_slug}",
+            'user' => $committer->user_login,
         ) );
 

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

@@ -149 +149 @@
     width: 100%;
 }
+
+.add-committer .notice {
+    display: block;
+    padding: 0.5em 0 0.5em 1em;
+}

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

@@ -33 +33 @@
                     }
                     return true;
-                }
+                },
+                addAfter: PluginEdit.committerRequestAfter,
+                delAfter: PluginEdit.committerRequestAfter
             }).on( 'wpListAddEnd', function() {
                 $( 'input[name="add_committer"]', '#add-committer' ).val( '' ).focus();
@@ -125 +127 @@
                 }
             } );
+        },
+
+        committerRequestAfter: function( response, data ) {
+            if ( data.parsed.errors ) {
+                $( '#committer-error' ).text( data.parsed.responses[0].errors[0].message ).show();
+            } else {
+                $( '#committer-error' ).empty().hide();
+            }
         }
     };