Changeset 6570

Timestamp:

01/07/2008 08:38:49 PM (17 years ago)

Author:

ryan

Message:

Mass select for users from cpoteet and mdawaffe. fixes #5592

Location:

trunk

Files:

• wp-admin/admin-ajax.php (modified) (1 diff)
• wp-admin/edit-comments.php (modified) (2 diffs)
• wp-admin/includes/template.php (modified) (2 diffs)
• wp-admin/js/forms.js (added)
• wp-admin/link-manager.php (modified) (2 diffs)
• wp-admin/users.php (modified) (4 diffs)
• wp-includes/script-loader.php (modified) (1 diff)

trunk/wp-admin/admin-ajax.php

@@ -388 +388 @@
         'what' => 'user',
         'id' => $user_id,
-        'data' => user_row( $user_object ),
+        'data' => user_row( $user_object, '', $user_object->roles[0] ),
         'supplemental' => array(
             'show-link' => sprintf(__( 'User <a href="#%s">%s</a> added' ), "user-$user_id", $user_object->user_login),

trunk/wp-admin/edit-comments.php

@@ -5 +5 @@
 $parent_file = 'edit-comments.php';
 wp_enqueue_script( 'admin-comments' );
+wp_enqueue_script('admin-forms');
 
 require_once('admin-header.php');
@@ -10 +11 @@
 else $mode = attribute_escape($_GET['mode']);
 ?>
-
-<script type="text/javascript">
-<!--
-function checkAll(form)
-{
-    for (i = 0, n = form.elements.length; i < n; i++) {
-        if(form.elements[i].type == "checkbox") {
-            if(form.elements[i].checked == true)
-                form.elements[i].checked = false;
-            else
-                form.elements[i].checked = true;
-        }
-    }
-}
-
-function getNumChecked(form)
-{
-    var num = 0;
-    for (i = 0, n = form.elements.length; i < n; i++) {
-        if(form.elements[i].type == "checkbox") {
-            if(form.elements[i].checked == true)
-                num++;
-        }
-    }
-    return num;
-}
-//-->
-</script>
 <div class="wrap">
 <h2><?php _e('Comments'); ?></h2>

trunk/wp-admin/includes/template.php

@@ -314 +314 @@
 }
 
-function user_row( $user_object, $style = '' ) {
+function user_row( $user_object, $style = '', $role = '' ) {
     if ( !( is_object( $user_object) && is_a( $user_object, 'WP_User' ) ) )
         $user_object = new WP_User( (int) $user_object );
@@ -327 +327 @@
     $numposts = get_usernumposts( $user_object->ID );
     $r = "<tr id='user-$user_object->ID'$style>
-        <td><input type='checkbox' name='users[]' id='user_{$user_object->ID}' value='{$user_object->ID}' /> <label for='user_{$user_object->ID}'>{$user_object->ID}</label></td>
+        <td><input type='checkbox' name='users[]' id='user_{$user_object->ID}' class='$role' value='{$user_object->ID}' /> <label for='user_{$user_object->ID}'>{$user_object->ID}</label></td>
         <td><label for='user_{$user_object->ID}'><strong>$user_object->user_login</strong></label></td>
         <td><label for='user_{$user_object->ID}'>$user_object->first_name $user_object->last_name</label></td>

trunk/wp-admin/link-manager.php

@@ -8 +8 @@
 
 wp_enqueue_script( 'wp-lists' );
+wp_enqueue_script('admin-forms');
 
 wp_reset_vars(array('action', 'cat_id', 'linkurl', 'name', 'image', 'description', 'visible', 'target', 'category', 'link_id', 'submit', 'order_by', 'links_show_cat_id', 'rating', 'rel', 'notes', 'linkcheck[]'));
@@ -46 +47 @@
 }
 ?>
-<script type="text/javascript">
-/* <![CDATA[ */
-function checkAll(form)
-{
-    for (i = 0, n = form.elements.length; i < n; i++) {
-        if(form.elements[i].type == "checkbox") {
-            if(form.elements[i].checked == true)
-                form.elements[i].checked = false;
-            else
-                form.elements[i].checked = true;
-        }
-    }
-}
-
-jQuery(function($){$('#the-list').wpList();});
-
-/* ]]> */
-</script>
-
+<script type="text/javascript" src="js/edit-comments.js"></script>
 <?php
 if ( isset($_GET['deleted']) ) {

trunk/wp-admin/users.php

@@ -210 +210 @@
 <?php wp_nonce_field('delete-users') ?>
 <?php echo $referer; ?>
+
 <div class="wrap">
 <h2><?php _e('Delete Users'); ?></h2>
@@ -271 +272 @@
 default:
     wp_enqueue_script('admin-users');
-
+    wp_enqueue_script('admin-forms');
+    
     include('admin-header.php');
 
@@ -386 +388 @@
 </tr>
 <tr class="thead">
+    <th><input type="checkbox" onclick="checkAllUsers('<?php echo $role; ?>')"/></th>
     <th><?php _e('ID') ?></th>
     <th><?php _e('Username') ?></th>
@@ -398 +401 @@
 foreach ( (array) $roleclass as $user_object ) {
     $style = ( ' class="alternate"' == $style ) ? '' : ' class="alternate"';
-    echo "\n\t" . user_row($user_object, $style);
+    echo "\n\t" . user_row($user_object, $style, $role);
 }
 ?>

trunk/wp-includes/script-loader.php

@@ -120 +120 @@
             $this->add( 'admin-posts', '/wp-admin/js/edit-posts.js', array('wp-lists'), '20071023' );
             $this->add( 'admin-users', '/wp-admin/js/users.js', array('wp-lists'), '20070823' );
+            $this->add( 'admin-forms', '/wp-admin/js/forms.js', array('wp-lists'), '20080108' );
             $this->add( 'xfn', '/wp-admin/js/xfn.js', false, '3517' );
             $this->add( 'upload', '/wp-admin/js/upload.js', array('jquery'), '20070518' );