Changeset 19897

Timestamp:

02/10/2012 08:45:17 AM (13 years ago)

Author:

markjaquith

Message:

Autocomplete for add-user screens in multisite. props boonebgorges, Japh, DrewAPicture, PeteMall, nacin, koopersmith, markjaquith. see #19810.

Location:

trunk

Files:

• wp-admin/admin-ajax.php (modified) (1 diff)
• wp-admin/css/wp-admin.dev.css (modified) (1 diff)
• wp-admin/includes/ajax-actions.php (modified) (1 diff)
• wp-admin/js/user-search.dev.js (added)
• wp-admin/js/user-search.js (added)
• wp-admin/network/site-users.php (modified) (1 diff)
• wp-admin/user-new.php (modified) (1 diff)
• wp-includes/script-loader.php (modified) (1 diff)

trunk/wp-admin/admin-ajax.php

@@ -35 +35 @@
 do_action( 'admin_init' );
 
-$core_actions_get = array( 'fetch-list', 'ajax-tag-search', 'wp-compression-test', 'imgedit-preview', 'oembed_cache' );
+$core_actions_get = array( 'fetch-list', 'ajax-tag-search', 'wp-compression-test', 'imgedit-preview', 'oembed_cache', 'autocomplete-user' );
 
 $core_actions_post = array(

trunk/wp-admin/css/wp-admin.dev.css

@@ -893 +893 @@
 }
 
+input[type="text"].ui-autocomplete-loading {
+    background: transparent url('../images/loading.gif') no-repeat right center;
+    visibility: visible;
+}
+
+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;
+}
 
 /*------------------------------------------------------------------------------

trunk/wp-admin/includes/ajax-actions.php

@@ -148 +148 @@
     $return = ( $wp_embed->cache_oembed( $_GET['post'] ) ) ? '1' : '0';
     wp_die( $return );
+}
+
+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 ) );
 }
 

trunk/wp-admin/network/site-users.php

@@ -172 +172 @@
 $submenu_file = 'sites.php';
 
+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' );
+
 require('../admin-header.php'); ?>
+
+<script type='text/javascript'>
+/* <![CDATA[ */
+var current_site_id = <?php echo $id; ?>;
+/* ]]> */
+</script>
+
 
 <div class="wrap">

trunk/wp-admin/user-new.php

@@ -179 +179 @@
 wp_enqueue_script('wp-ajax-response');
 wp_enqueue_script('user-profile');
-
-require_once ('admin-header.php');
+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' );
+
+require_once( 'admin-header.php' );
 
 if ( isset($_GET['update']) ) {

trunk/wp-includes/script-loader.php

@@ -261 +261 @@
     $scripts->add( 'user-profile', "/wp-admin/js/user-profile$suffix.js", array( 'jquery', 'password-strength-meter' ), false, 1 );
 
+    $scripts->add( 'user-search', "/wp-admin/js/user-search$suffix.js", array( 'jquery-ui-autocomplete' ), false, 1 );
+
     $scripts->add( 'admin-bar', "/wp-includes/js/admin-bar$suffix.js", array(), false, 1 );