Changeset 7146

Timestamp:

06/04/2013 03:04:33 AM (12 years ago)

Author:

boonebgorges

Message:

Updates the Groups Admin member interface to use BP_Group_Member_Query

This provides increased flexibility for fixes to be introduced for #4977

Location:

trunk/bp-groups

Files:

• admin/js/admin.js (modified) (1 diff)
• bp-groups-admin.php (modified) (5 diffs)

trunk/bp-groups/admin/js/admin.js

@@ -12 +12 @@
     }
 
-    var id = 'undefined' !== typeof group_members ? '&group_members=' + group_members : '';
+    var id = 'undefined' !== typeof group_id ? '&group_id=' + group_id : '';
     $(document).ready( function() {
         /* Initialize autocomplete */

trunk/bp-groups/bp-groups-admin.php

@@ -719 +719 @@
         'mod'    => array(),
         'member' => array(),
-        'banned' => array()
+        'banned' => array(),
     );
 
-    if ( bp_group_has_members( array(
-        'group_id' => $item->id,
-        'exclude_admins_mods' => false,
-        'exclude_banned' => false
-    ) ) ) {
-        // Get a list of admins and mods, to reduce lookups
-        // We'll rekey them by user_id for convenience
-        $admins = $mods = array();
-
-        foreach ( (array) groups_get_group_admins( $item->id ) as $admin_obj ) {
-            $admins[ $admin_obj->user_id ] = $admin_obj;
-        }
-
-        foreach ( (array) groups_get_group_mods( $item->id ) as $admin_obj ) {
-            $mods[ $admin_obj->user_id ] = $admin_obj;
-        }
-
-        while ( bp_group_members() ) {
-            bp_group_the_member();
-            if ( bp_get_group_member_is_banned() ) {
-                $members['banned'][] = $members_template->member;
-            } else if ( isset( $admins[ bp_get_group_member_id() ] ) ) {
-                $members['admin'][]  = $members_template->member;
-            } else if ( isset( $mods[ bp_get_group_member_id() ] ) ) {
-                $members['mod'][]    = $members_template->member;
-            } else {
-                $members['member'][] = $members_template->member;
-            }
-
-            $member_ids[] = bp_get_group_member_id();
-        }
+    foreach ( $members as $type => &$member_type_users ) {
+        $member_type_query = new BP_Group_Member_Query( array(
+            'group_id'   => $item->id,
+            'group_role' => array( $type ),
+            'type'       => 'alphabetical',
+            'per_page'   => 10,
+        ) );
+
+        $member_type_users = $member_type_query->results;
     }
 
     // Echo out the javascript variable
-    $member_ids = ! empty( $member_ids ) ? implode( ',', $member_ids ) : '';
-    echo '<script type="text/javascript">var group_members = "' . $member_ids . '";</script>';
+    echo '<script type="text/javascript">var group_id = "' . $item->id . '";</script>';
 
     // Loop through each member type
@@ -787 +764 @@
 
                 <?php foreach ( $type_users as $type_user ) : ?>
-
                     <tr>
-                        <th scope="row" class="uid-column"><?php echo esc_html( $type_user->user_id ); ?></th>
+                        <th scope="row" class="uid-column"><?php echo esc_html( $type_user->ID ); ?></th>
 
                         <td class="uname-column">
-                            <a style="float: left;" href="<?php echo bp_core_get_user_domain( $type_user->user_id ); ?>"><?php echo bp_core_fetch_avatar( array(
-                                'item_id' => $type_user->user_id,
+                            <a style="float: left;" href="<?php echo bp_core_get_user_domain( $type_user->ID ); ?>"><?php echo bp_core_fetch_avatar( array(
+                                'item_id' => $type_user->ID,
                                 'width'   => '32',
                                 'height'  => '32'
                             ) ); ?></a>
 
-                            <span style="margin: 8px; float: left;"><?php echo bp_core_get_userlink( $type_user->user_id ) ?></span>
+                            <span style="margin: 8px; float: left;"><?php echo bp_core_get_userlink( $type_user->ID ) ?></span>
                         </td>
 
                         <td class="urole-column">
-                            <select class="bp-groups-role" id="bp-groups-role-<?php echo esc_attr( $type_user->user_id ); ?>" name="bp-groups-role[<?php echo esc_attr( $type_user->user_id ); ?>]">
+                            <select class="bp-groups-role" id="bp-groups-role-<?php echo esc_attr( $type_user->ID ); ?>" name="bp-groups-role[<?php echo esc_attr( $type_user->ID ); ?>]">
                                 <option value="admin" <?php selected( 'admin', $member_type ) ?>><?php _e( 'Administrator', 'buddypress' ) ?></option>
                                 <option value="mod" <?php selected( 'mod', $member_type ) ?>><?php _e( 'Moderator', 'buddypress' ) ?></option>
@@ -817 +793 @@
                              * @todo remove this, and do database detection on save
                              */ ?>
-                            <input type="hidden" name="bp-groups-existing-role[<?php echo esc_attr( $type_user->user_id ); ?>]" value="<?php echo esc_attr( $member_type ); ?>" />
+                            <input type="hidden" name="bp-groups-existing-role[<?php echo esc_attr( $type_user->ID ); ?>]" value="<?php echo esc_attr( $member_type ); ?>" />
                         </td>
                     </tr>
@@ -824 +800 @@
                         <tr>
                             <td colspan="3">
-                                <?php do_action( 'bp_groups_admin_manage_member_row', $type_user->user_id, $item ); ?>
+                                <?php do_action( 'bp_groups_admin_manage_member_row', $type_user->ID, $item ); ?>
                             </td>
                         </tr>
@@ -905 +881 @@
 
     // Exclude current group members
-    $group_members = isset( $_REQUEST['group_members'] ) ? wp_parse_id_list( $_REQUEST['group_members'] ) : array();
-    $terms         = isset( $_REQUEST['term']          ) ? $_REQUEST['term'] : '';
-    $users         = get_users( array(
+    $group_id = isset( $_GET['group_id'] ) ? wp_parse_id_list( $_GET['group_id'] ) : array();
+    $group_member_query = new BP_Group_Member_Query( array(
+        'group_id'        => $group_id,
+        'per_page'        => 0, // show all
+        'group_type'      => array( 'member', 'mod', 'admin', ),
+        'populate_extras' => false,
+        'count_total'     => false,
+    ) );
+
+    $group_members = ! empty( $group_member_query->results ) ? wp_list_pluck( $group_member_query->results, 'ID' ) : array();
+
+    $terms = isset( $_GET['term'] ) ? $_GET['term'] : '';
+    $users = get_users( array(
         'blog_id'        => false,
         'search'         => '*' . $terms . '*',