Changeset 27046

Timestamp:

01/27/2014 11:09:08 PM (11 years ago)

Author:

helen

Message:

Autocomplete for the new site admin email. Better than trying to remember which email address you used.

fixes #25348.

Location:

trunk/src/wp-admin

Files:

• includes/ajax-actions.php (modified) (2 diffs)
• js/user-suggest.js (modified) (1 diff)
• network/site-new.php (modified) (2 diffs)

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

@@ -198 +198 @@
 
     // Check the type of request
-    if ( isset( $_REQUEST['autocomplete_type'] ) )
+    // Current allowed values are `add` and `search`
+    if ( isset( $_REQUEST['autocomplete_type'] ) && 'search' === $_REQUEST['autocomplete_type'] ) {
         $type = $_REQUEST['autocomplete_type'];
-    else
+    } else {
         $type = 'add';
+    }
+
+    // Check the desired field for value
+    // Current allowed values are `user_email` and `user_login`
+    if ( isset( $_REQUEST['autocomplete_field'] ) && 'user_email' === $_REQUEST['autocomplete_field'] ) {
+        $field = $_REQUEST['autocomplete_field'];
+    } else {
+        $field = 'user_login';
+    }
 
     // Exclude current users of this blog
-    if ( isset( $_REQUEST['site_id'] ) )
+    if ( isset( $_REQUEST['site_id'] ) ) {
         $id = absint( $_REQUEST['site_id'] );
-    else
+    } else {
         $id = get_current_blog_id();
+    }
 
     $include_blog_users = ( $type == 'search' ? get_users( array( 'blog_id' => $id, 'fields' => 'ID' ) ) : array() );
@@ -224 +235 @@
             /* translators: 1: user_login, 2: user_email */
             'label' => sprintf( __( '%1$s (%2$s)' ), $user->user_login, $user->user_email ),
-            'value' => $user->user_login,
+            'value' => $user->$field,
         );
     }

trunk/src/wp-admin/js/user-suggest.js

@@ -9 +9 @@
             position.at = 'right bottom';
         }
-        $( '.wp-suggest-user' ).autocomplete({
-            source:    ajaxurl + '?action=autocomplete-user&autocomplete_type=add' + id,
-            delay:     500,
-            minLength: 2,
-            position:  position,
-            open: function() {
-                $( this ).addClass( 'open' );
-            },
-            close: function() {
-                $( this ).removeClass( 'open' );
-            }
+        $( '.wp-suggest-user' ).each( function(){
+            var $this = $( this ),
+                autocompleteType = ( typeof $this.data( 'autocompleteType' ) !== 'undefined' ) ? $this.data( 'autocompleteType' ) : 'add',
+                autocompleteField = ( typeof $this.data( 'autocompleteField' ) !== 'undefined' ) ? $this.data( 'autocompleteField' ) : 'user_login';
+
+            $this.autocomplete({
+                source:    ajaxurl + '?action=autocomplete-user&autocomplete_type=' + autocompleteType + '&autocomplete_field=' + autocompleteField + id,
+                delay:     500,
+                minLength: 2,
+                position:  position,
+                open: function() {
+                    $( this ).addClass( 'open' );
+                },
+                close: function() {
+                    $( this ).removeClass( 'open' );
+                }
+            });
         });
     });

trunk/src/wp-admin/network/site-new.php

@@ -107 +107 @@
 $parent_file = 'sites.php';
 
+wp_enqueue_script( 'user-suggest' );
+
 require( ABSPATH . 'wp-admin/admin-header.php' );
 
@@ -139 +141 @@
         <tr class="form-field form-required">
             <th scope="row"><?php _e( 'Admin Email' ) ?></th>
-            <td><input name="blog[email]" type="text" class="regular-text" title="<?php esc_attr_e( 'Email' ) ?>"/></td>
+            <td><input name="blog[email]" type="text" class="regular-text wp-suggest-user" data-autocomplete-type="search" data-autocomplete-field="user_email" title="<?php esc_attr_e( 'Email' ) ?>"/></td>
         </tr>
         <tr class="form-field">