<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[2753] sites/trunk/wordpress.org/public_html/wp-content/plugins/plugin-directory: Plugin Directory: After [2752], improve error handling and docs.</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta" style="font-size: 105%">
<dt style="float: left; width: 6em; font-weight: bold">Revision</dt> <dd><a style="font-weight: bold" href="http://meta.trac.wordpress.org/changeset/2753">2753</a><script type="application/ld+json">{"@context":"http://schema.org","@type":"EmailMessage","description":"Review this Commit","action":{"@type":"ViewAction","url":"http://meta.trac.wordpress.org/changeset/2753","name":"Review Commit"}}</script></dd>
<dt style="float: left; width: 6em; font-weight: bold">Author</dt> <dd>obenland</dd>
<dt style="float: left; width: 6em; font-weight: bold">Date</dt> <dd>2016-03-15 21:11:27 +0000 (Tue, 15 Mar 2016)</dd>
</dl>
<pre style='padding-left: 1em; margin: 2em 0; border-left: 2px solid #ccc; line-height: 1.25; font-size: 105%; font-family: sans-serif'>Plugin Directory: After <a href="http://meta.trac.wordpress.org/changeset/2752">[2752]</a>, improve error handling and docs.
See <a href="http://meta.trac.wordpress.org/ticket/1571">#1571</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#sitestrunkwordpressorgpublic_htmlwpcontentpluginsplugindirectoryadminclasscommitterslisttablephp">sites/trunk/wordpress.org/public_html/wp-content/plugins/plugin-directory/admin/class-committers-list-table.php</a></li>
<li><a href="#sitestrunkwordpressorgpublic_htmlwpcontentpluginsplugindirectoryadminmetaboxclasscommittersphp">sites/trunk/wordpress.org/public_html/wp-content/plugins/plugin-directory/admin/metabox/class-committers.php</a></li>
<li><a href="#sitestrunkwordpressorgpublic_htmlwpcontentpluginsplugindirectorycsseditformcss">sites/trunk/wordpress.org/public_html/wp-content/plugins/plugin-directory/css/edit-form.css</a></li>
<li><a href="#sitestrunkwordpressorgpublic_htmlwpcontentpluginsplugindirectoryjseditformjs">sites/trunk/wordpress.org/public_html/wp-content/plugins/plugin-directory/js/edit-form.js</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="sitestrunkwordpressorgpublic_htmlwpcontentpluginsplugindirectoryadminclasscommitterslisttablephp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: sites/trunk/wordpress.org/public_html/wp-content/plugins/plugin-directory/admin/class-committers-list-table.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- sites/trunk/wordpress.org/public_html/wp-content/plugins/plugin-directory/admin/class-committers-list-table.php 2016-03-15 20:02:51 UTC (rev 2752)
+++ sites/trunk/wordpress.org/public_html/wp-content/plugins/plugin-directory/admin/class-committers-list-table.php 2016-03-15 21:11:27 UTC (rev 2753)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -121,6 +121,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> <button type="button" id="add-committer-toggle" class="button-link"><?php _e( '+ Add New Committer', 'wporg-plugins' ); ?></button>
</span><span class="cx" style="display: block; padding: 0 10px"> <p class="wp-hidden-child">
</span><span class="cx" style="display: block; padding: 0 10px"> <?php wp_nonce_field( 'add-committer', '_ajax_nonce', false ); ?>
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <span id="committer-error" class="notice notice-alt notice-error" style="display:none;"></span>
</ins><span class="cx" style="display: block; padding: 0 10px"> <input type="text" name="add_committer" class="form-required" value="" aria-required="true">
</span><span class="cx" style="display: block; padding: 0 10px"> <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' ); ?>">
</span><span class="cx" style="display: block; padding: 0 10px"> </p>
</span></span></pre></div>
<a id="sitestrunkwordpressorgpublic_htmlwpcontentpluginsplugindirectoryadminmetaboxclasscommittersphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: sites/trunk/wordpress.org/public_html/wp-content/plugins/plugin-directory/admin/metabox/class-committers.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- sites/trunk/wordpress.org/public_html/wp-content/plugins/plugin-directory/admin/metabox/class-committers.php 2016-03-15 20:02:51 UTC (rev 2752)
+++ sites/trunk/wordpress.org/public_html/wp-content/plugins/plugin-directory/admin/metabox/class-committers.php 2016-03-15 21:11:27 UTC (rev 2753)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -21,40 +21,50 @@
</span><span class="cx" style="display: block; padding: 0 10px"> return array_filter( $classes );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ /**
+ * Displays a list of committers for the current plugin.
+ */
</ins><span class="cx" style="display: block; padding: 0 10px"> public static function display() {
</span><span class="cx" style="display: block; padding: 0 10px"> $list = new Committers_List_Table();
</span><span class="cx" style="display: block; padding: 0 10px"> $list->prepare_items();
</span><span class="cx" style="display: block; padding: 0 10px"> $list->display();
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ /**
+ * Ajax handler for adding a new committer.
+ */
</ins><span class="cx" style="display: block; padding: 0 10px"> public static function add_committer() {
</span><span class="cx" style="display: block; padding: 0 10px"> check_ajax_referer( 'add-committer' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $login = isset( $_POST['add_committer'] ) ? sanitize_user( $_POST['add_committer'] ) : '';
- $post_id = isset( $_POST['post_id'] ) ? (int) $_POST['post_id'] : 0;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $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();
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! $committer = get_user_by( 'login', $login ) ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- wp_die( time() );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $response->add( array(
+ 'what' => 'committer',
+ 'data' => new \WP_Error( 'error', sprintf( __( 'The user %s does not exist.', 'wporg-plugins' ), '<code>' . $login . '</code>' ) ),
+ ) );
+ $response->send();
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( ! current_user_can( 'manage_committers', $post_id ) ) {
- // wp_die( -1 );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // @todo: Capabilities.
+ if ( ! current_user_can( 'add_committers', $post_id ) ) {
+ // wp_die( -1 );
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> global $post, $wpdb;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $response = new \WP_Ajax_Response();
- $post = get_post( $post_id );
-
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $post = get_post( $post_id );
</ins><span class="cx" style="display: block; padding: 0 10px"> $result = $wpdb->insert( PLUGINS_TABLE_PREFIX . 'svn_access', array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'path' => "/{$post->post_name}",
</span><span class="cx" style="display: block; padding: 0 10px"> 'user' => $login,
</span><span class="cx" style="display: block; padding: 0 10px"> 'access' => 'rw',
</span><span class="cx" style="display: block; padding: 0 10px"> ) );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-
</del><span class="cx" style="display: block; padding: 0 10px"> if ( ! $result ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $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();
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 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' );
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $response->add( array(
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -75,25 +85,35 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $response->send();
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ /**
+ * Ajax handler for removing a committer.
+ */
</ins><span class="cx" style="display: block; padding: 0 10px"> public static function remove_committer() {
</span><span class="cx" style="display: block; padding: 0 10px"> $id = isset( $_POST['id'] ) ? (int) $_POST['id'] : 0;
</span><span class="cx" style="display: block; padding: 0 10px"> $post_id = isset( $_POST['post_id'] ) ? (int) $_POST['post_id'] : 0;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> check_ajax_referer( "remove-committer-$id" );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $response = new \WP_Ajax_Response();
+
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( ! $committer = get_user_by( 'id', $id ) ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- wp_die( time() );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $response->add( array(
+ 'what' => 'committer',
+ 'data' => new \WP_Error( 'error', sprintf( __( 'The user %s does not exist.', 'wporg-plugins' ), '<code>' . $login . '</code>' ) ),
+ ) );
+ $response->send();
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( ! current_user_can( 'manage_committers', $post_id ) ) {
- // wp_die( -1 );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // @todo: Capabilities.
+ if ( ! current_user_can( 'remove_committers', $post_id ) ) {
+ // wp_die( -1 );
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $plugin_slug = get_post( $post_id )->post_name;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $result = $GLOBALS['wpdb']->delete( PLUGINS_TABLE_PREFIX . 'svn_access', array(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'path' => "/{$plugin_slug}",
- 'user' => $committer->user_login,
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'path' => "/{$plugin_slug}",
+ 'user' => $committer->user_login,
</ins><span class="cx" style="display: block; padding: 0 10px"> ) );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> wp_die( $result );
</span></span></pre></div>
<a id="sitestrunkwordpressorgpublic_htmlwpcontentpluginsplugindirectorycsseditformcss"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: sites/trunk/wordpress.org/public_html/wp-content/plugins/plugin-directory/css/edit-form.css</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- sites/trunk/wordpress.org/public_html/wp-content/plugins/plugin-directory/css/edit-form.css 2016-03-15 20:02:51 UTC (rev 2752)
+++ sites/trunk/wordpress.org/public_html/wp-content/plugins/plugin-directory/css/edit-form.css 2016-03-15 21:11:27 UTC (rev 2753)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -148,3 +148,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> vertical-align: baseline;
</span><span class="cx" style="display: block; padding: 0 10px"> width: 100%;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
+.add-committer .notice {
+ display: block;
+ padding: 0.5em 0 0.5em 1em;
+}
</ins></span></pre></div>
<a id="sitestrunkwordpressorgpublic_htmlwpcontentpluginsplugindirectoryjseditformjs"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: sites/trunk/wordpress.org/public_html/wp-content/plugins/plugin-directory/js/edit-form.js</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- sites/trunk/wordpress.org/public_html/wp-content/plugins/plugin-directory/js/edit-form.js 2016-03-15 20:02:51 UTC (rev 2752)
+++ sites/trunk/wordpress.org/public_html/wp-content/plugins/plugin-directory/js/edit-form.js 2016-03-15 21:11:27 UTC (rev 2753)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -32,7 +32,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> return confirm( pluginDirectory.removeCommitterAYS );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> return true;
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- }
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ },
+ addAfter: PluginEdit.committerRequestAfter,
+ delAfter: PluginEdit.committerRequestAfter
</ins><span class="cx" style="display: block; padding: 0 10px"> }).on( 'wpListAddEnd', function() {
</span><span class="cx" style="display: block; padding: 0 10px"> $( 'input[name="add_committer"]', '#add-committer' ).val( '' ).focus();
</span><span class="cx" style="display: block; padding: 0 10px"> } );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -124,6 +126,14 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $( '#add-committer-submit', $form ).click();
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> } );
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ },
+
+ committerRequestAfter: function( response, data ) {
+ if ( data.parsed.errors ) {
+ $( '#committer-error' ).text( data.parsed.responses[0].errors[0].message ).show();
+ } else {
+ $( '#committer-error' ).empty().hide();
+ }
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> };
</span><span class="cx" style="display: block; padding: 0 10px">
</span></span></pre>
</div>
</div>
</body>
</html>