<!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>[19897] trunk: Autocomplete for add-user screens in multisite.</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, #logmsg > ol { margin-left: 0; 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">
<dt>Revision</dt> <dd><a href="http://core.trac.wordpress.org/changeset/19897">19897</a></dd>
<dt>Author</dt> <dd>markjaquith</dd>
<dt>Date</dt> <dd>2012-02-10 08:45:17 +0000 (Fri, 10 Feb 2012)</dd>
</dl>
<h3>Log Message</h3>
<pre>Autocomplete for add-user screens in multisite. props boonebgorges, Japh, DrewAPicture, PeteMall, nacin, koopersmith, markjaquith. see <a href="http://core.trac.wordpress.org/ticket/19810">#19810</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkwpadminadminajaxphp">trunk/wp-admin/admin-ajax.php</a></li>
<li><a href="#trunkwpadmincsswpadmindevcss">trunk/wp-admin/css/wp-admin.dev.css</a></li>
<li><a href="#trunkwpadminincludesajaxactionsphp">trunk/wp-admin/includes/ajax-actions.php</a></li>
<li><a href="#trunkwpadminnetworksiteusersphp">trunk/wp-admin/network/site-users.php</a></li>
<li><a href="#trunkwpadminusernewphp">trunk/wp-admin/user-new.php</a></li>
<li><a href="#trunkwpincludesscriptloaderphp">trunk/wp-includes/script-loader.php</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkwpadminjsusersearchdevjs">trunk/wp-admin/js/user-search.dev.js</a></li>
<li><a href="#trunkwpadminjsusersearchjs">trunk/wp-admin/js/user-search.js</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkwpadminadminajaxphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/admin-ajax.php (19896 => 19897)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/admin-ajax.php 2012-02-09 23:30:50 UTC (rev 19896)
+++ trunk/wp-admin/admin-ajax.php 2012-02-10 08:45:17 UTC (rev 19897)
</span><span class="lines">@@ -34,7 +34,7 @@
</span><span class="cx">
</span><span class="cx"> do_action( 'admin_init' );
</span><span class="cx">
</span><del>-$core_actions_get = array( 'fetch-list', 'ajax-tag-search', 'wp-compression-test', 'imgedit-preview', 'oembed_cache' );
</del><ins>+$core_actions_get = array( 'fetch-list', 'ajax-tag-search', 'wp-compression-test', 'imgedit-preview', 'oembed_cache', 'autocomplete-user' );
</ins><span class="cx">
</span><span class="cx"> $core_actions_post = array(
</span><span class="cx"> 'oembed_cache', 'image-editor', 'delete-comment', 'delete-tag', 'delete-link',
</span></span></pre></div>
<a id="trunkwpadmincsswpadmindevcss"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/css/wp-admin.dev.css (19896 => 19897)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/css/wp-admin.dev.css 2012-02-09 23:30:50 UTC (rev 19896)
+++ trunk/wp-admin/css/wp-admin.dev.css 2012-02-10 08:45:17 UTC (rev 19897)
</span><span class="lines">@@ -892,7 +892,46 @@
</span><span class="cx"> margin: 0;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+input[type="text"].ui-autocomplete-loading {
+ background: transparent url('../images/loading.gif') no-repeat right center;
+ visibility: visible;
+}
</ins><span class="cx">
</span><ins>+ul#add-to-blog-users {
+ margin: 0 0 0 14px;
+}
+
+.ui-autocomplete {
+ padding: 0;
+ margin: 0;
+ list-style: none;
+ position: absolute;
+ z-index: 10000;
+ border-width: 1px;
+ border-style: solid;
+
+ background-color: #ececec;
+ border-color: gray;
+}
+
+.ui-autocomplete li {
+ padding: 2px 5px;
+ white-space: nowrap;
+ text-align: left;
+ color: #101010;
+}
+
+.ui-autocomplete li a {
+ display: block;
+ height: 100%;
+ padding: 2px 5px;
+ color: #333;
+}
+
+.ui-autocomplete li a.ui-state-hover {
+ background-color: #f0f0b8;
+}
+
</ins><span class="cx"> /*------------------------------------------------------------------------------
</span><span class="cx"> 3.0 - Actions
</span><span class="cx"> ------------------------------------------------------------------------------*/
</span></span></pre></div>
<a id="trunkwpadminincludesajaxactionsphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/includes/ajax-actions.php (19896 => 19897)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/includes/ajax-actions.php 2012-02-09 23:30:50 UTC (rev 19896)
+++ trunk/wp-admin/includes/ajax-actions.php 2012-02-10 08:45:17 UTC (rev 19897)
</span><span class="lines">@@ -149,6 +149,38 @@
</span><span class="cx"> wp_die( $return );
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+function wp_ajax_autocomplete_user() {
+ if ( !is_multisite() || !current_user_can( 'promote_users' ) || wp_is_large_network( 'users' ) || !is_super_admin() && apply_filters( 'autocomplete_users_for_site_admins', false ) )
+ wp_die( -1 );
+
+ $return = array();
+
+ // Exclude current users of this blog
+ if ( isset( $_REQUEST['site_id'] ) )
+ $id = absint( $_REQUEST['site_id'] );
+ else
+ $id = get_current_blog_id();
+
+ $this_blog_users = get_users( array( 'blog_id' => $id, 'fields' => 'ID' ) );
+
+ $users = get_users( array(
+ 'blog_id' => false,
+ 'search' => '*' . $_REQUEST['term'] . '*',
+ 'exclude' => $this_blog_users,
+ 'search_columns' => array( 'user_login', 'user_nicename', 'user_email' ),
+ ) );
+
+ foreach ( $users as $user ) {
+ $return[] = array(
+ /* translators: 1: user_login, 2: user_email */
+ 'label' => sprintf( __( '%1$s (%2$s)' ), $user->user_login, $user->user_email ),
+ 'value' => $user->user_login,
+ );
+ }
+
+ wp_die( json_encode( $return ) );
+}
+
</ins><span class="cx"> /*
</span><span class="cx"> * Ajax helper.
</span><span class="cx"> */
</span></span></pre></div>
<a id="trunkwpadminjsusersearchdevjs"></a>
<div class="addfile"><h4>Added: trunk/wp-admin/js/user-search.dev.js (0 => 19897)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/js/user-search.dev.js (rev 0)
+++ trunk/wp-admin/js/user-search.dev.js 2012-02-10 08:45:17 UTC (rev 19897)
</span><span class="lines">@@ -0,0 +1,9 @@
</span><ins>+jQuery( function($) {
+ var id = typeof( current_site_id ) != 'undefined' ? '&site_id=' + current_site_id : '';
+
+ $( '#adduser-email, #newuser' ).autocomplete({
+ source: ajaxurl + '?action=autocomplete-user' + id,
+ delay: 500,
+ minLength: 2,
+ });
+});
</ins><span class="cx">\ No newline at end of file
</span></span></pre></div>
<a id="trunkwpadminnetworksiteusersphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/network/site-users.php (19896 => 19897)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/network/site-users.php 2012-02-09 23:30:50 UTC (rev 19896)
+++ trunk/wp-admin/network/site-users.php 2012-02-10 08:45:17 UTC (rev 19897)
</span><span class="lines">@@ -171,8 +171,18 @@
</span><span class="cx"> $parent_file = 'sites.php';
</span><span class="cx"> $submenu_file = 'sites.php';
</span><span class="cx">
</span><ins>+if ( current_user_can( 'promote_users' ) && apply_filters( 'show_network_site_users_add_existing_form', true ) && !wp_is_large_network( 'users' ) )
+ wp_enqueue_script( 'user-search' );
+
</ins><span class="cx"> require('../admin-header.php'); ?>
</span><span class="cx">
</span><ins>+<script type='text/javascript'>
+/* <![CDATA[ */
+var current_site_id = <?php echo $id; ?>;
+/* ]]> */
+</script>
+
+
</ins><span class="cx"> <div class="wrap">
</span><span class="cx"> <?php screen_icon('ms-admin'); ?>
</span><span class="cx"> <h2 id="edit-site"><?php echo $title_site_url_linked ?></h2>
</span></span></pre></div>
<a id="trunkwpadminusernewphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/user-new.php (19896 => 19897)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/user-new.php 2012-02-09 23:30:50 UTC (rev 19896)
+++ trunk/wp-admin/user-new.php 2012-02-10 08:45:17 UTC (rev 19897)
</span><span class="lines">@@ -178,8 +178,10 @@
</span><span class="cx">
</span><span class="cx"> wp_enqueue_script('wp-ajax-response');
</span><span class="cx"> wp_enqueue_script('user-profile');
</span><ins>+if ( is_multisite() && current_user_can( 'promote_users' ) && !wp_is_large_network( 'users' ) && is_super_admin() || apply_filters( 'autocomplete_users_for_site_admins', false ) )
+ wp_enqueue_script( 'user-search' );
</ins><span class="cx">
</span><del>-require_once ('admin-header.php');
</del><ins>+require_once( 'admin-header.php' );
</ins><span class="cx">
</span><span class="cx"> if ( isset($_GET['update']) ) {
</span><span class="cx"> $messages = array();
</span></span></pre></div>
<a id="trunkwpincludesscriptloaderphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/script-loader.php (19896 => 19897)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/script-loader.php 2012-02-09 23:30:50 UTC (rev 19896)
+++ trunk/wp-includes/script-loader.php 2012-02-10 08:45:17 UTC (rev 19897)
</span><span class="lines">@@ -260,6 +260,8 @@
</span><span class="cx">
</span><span class="cx"> $scripts->add( 'user-profile', "/wp-admin/js/user-profile$suffix.js", array( 'jquery', 'password-strength-meter' ), false, 1 );
</span><span class="cx">
</span><ins>+ $scripts->add( 'user-search', "/wp-admin/js/user-search$suffix.js", array( 'jquery-ui-autocomplete' ), false, 1 );
+
</ins><span class="cx"> $scripts->add( 'admin-bar', "/wp-includes/js/admin-bar$suffix.js", array(), false, 1 );
</span><span class="cx">
</span><span class="cx"> $scripts->add( 'wplink', "/wp-includes/js/wplink$suffix.js", array( 'jquery', 'wpdialogs' ), false, 1 );
</span></span></pre>
</div>
</div>
</body>
</html>