Ticket #5440: 5440.02.patch

bp-groups/bp-groups-classes.php

@@ -1661 +1661 @@
                 // BP_Group_Member_Query::set_orderby()
                 $sql['orderby'] = "ORDER BY date_modified";
                 $sql['order']   = 'first_joined' === $this->query_vars['type'] ? 'ASC' : 'DESC';
-
                 $this->group_member_ids = $wpdb->get_col( "{$sql['select']} {$sql['where']} {$sql['orderby']} {$sql['order']}" );
 
                 /**

bp-groups/bp-groups-template.php

@@ -3053 +3053 @@
         }
 
         function the_request() {
+                global $group_id;
+
                 $this->in_the_loop = true;
                 $this->request     = $this->next_request();
 
@@ -3110 +3112 @@
         echo bp_get_group_request_reject_link();
 }
         function bp_get_group_request_reject_link() {
-                global $requests_template, $groups_template;
+                global $requests_template, $group_id;
 
-                return apply_filters( 'bp_get_group_request_reject_link', wp_nonce_url( bp_get_group_permalink( $groups_template->group ) . 'admin/membership-requests/reject/' . $requests_template->request->id, 'groups_reject_membership_request' ) );
+                $group_object = groups_get_group( array( 'group_id' => $group_id ) );
+
+                return apply_filters( 'bp_get_group_request_reject_link', wp_nonce_url( bp_get_group_permalink( $group_object ) . 'admin/membership-requests/reject/' . $requests_template->request->groups_members_table_id, 'groups_reject_membership_request' ) );
         }
 
 function bp_group_request_accept_link() {
         echo bp_get_group_request_accept_link();
 }
         function bp_get_group_request_accept_link() {
-                global $requests_template, $groups_template;
+                global $requests_template, $group_id;
+
+                $group_object = groups_get_group( array( 'group_id' => $group_id ) );
 
-                return apply_filters( 'bp_get_group_request_accept_link', wp_nonce_url( bp_get_group_permalink( $groups_template->group ) . 'admin/membership-requests/accept/' . $requests_template->request->id, 'groups_accept_membership_request' ) );
+                return apply_filters( 'bp_get_group_request_accept_link', wp_nonce_url( bp_get_group_permalink( $group_object ) . 'admin/membership-requests/accept/' . $requests_template->request->groups_members_table_id, 'groups_accept_membership_request' ) );
         }
 
 function bp_group_request_user_link() {
@@ -3145 +3151 @@
         echo apply_filters( 'bp_group_request_comment', strip_tags( stripslashes( $requests_template->request->comments ) ) );
 }
 
+/**
+ * Output pagination links for group membership requests.
+ *
+ * @since BuddyPress (2.0.0)
+ */
+function bp_group_mem_requests_pagination_links() {
+        echo bp_get_group_mem_requests_pagination_links();
+}
+        /**
+         * Get pagination links for group membership requests.
+         *
+         * @since BuddyPress (2.0.0)
+         */
+        function bp_get_group_mem_requests_pagination_links() {
+                global $requests_template;
+                return apply_filters( 'bp_get_group_mem_requests_pagination_links', $requests_template->pag_links );
+        }
+
+/**
+ * Output pagination count text for group membership requests.
+ *
+ * @since BuddyPress (2.0.0)
+ */
+function bp_group_mem_requests_pagination_count() {
+        echo bp_get_group_mem_requests_pagination_count();
+}
+        /**
+         * Get pagination count text for group membership requests.
+         *
+         * @since BuddyPress (2.0.0)
+         */
+        function bp_get_group_mem_requests_pagination_count() {
+                global $requests_template;
+
+                $start_num = intval( ( $requests_template->pag_page - 1 ) * $requests_template->pag_num ) + 1;
+                $from_num  = bp_core_number_format( $start_num );
+                $to_num    = bp_core_number_format( ( $start_num + ( $requests_template->pag_num - 1 ) > $requests_template->total_request_count ) ? $requests_template->total_request_count : $start_num + ( $requests_template->pag_num - 1 ) );
+                $total     = bp_core_number_format( $requests_template->total_request_count );
+
+                return apply_filters( 'bp_get_groups_pagination_count', sprintf( _n( 'Viewing requests %1$s to %2$s (of %3$s request)', 'Viewing request %1$s to %2$s (of %3$s requests)', $total, 'buddypress' ), $from_num, $to_num, $total ), $from_num, $to_num, $total );
+        }
+
 /************************************************************************************
  * Invite Friends Template Tags
  **/

bp-templates/bp-legacy/buddypress-functions.php

@@ -134 +134 @@
                 $actions = array(
 
                         // Directory filters
-                        'blogs_filter'    => 'bp_legacy_theme_object_template_loader',
-                        'forums_filter'   => 'bp_legacy_theme_object_template_loader',
-                        'groups_filter'   => 'bp_legacy_theme_object_template_loader',
-                        'members_filter'  => 'bp_legacy_theme_object_template_loader',
-                        'messages_filter' => 'bp_legacy_theme_messages_template_loader',
-                        'invite_filter'   => 'bp_legacy_theme_invite_template_loader',
+                        'blogs_filter'                                  => 'bp_legacy_theme_object_template_loader',
+                        'forums_filter'                                 => 'bp_legacy_theme_object_template_loader',
+                        'groups_filter'                                 => 'bp_legacy_theme_object_template_loader',
+                        'members_filter'                                => 'bp_legacy_theme_object_template_loader',
+                        'messages_filter'                               => 'bp_legacy_theme_messages_template_loader',
+                        'invite_filter'                                 => 'bp_legacy_theme_invite_template_loader',
+                        'membership_requests_filter'    => 'bp_legacy_theme_membership_requests_template_loader',
 
                         // Friends
                         'accept_friendship' => 'bp_legacy_theme_ajax_accept_friendship',
@@ -612 +613 @@
 }
 
 /**
+ * Load group membership requests loop to handle pagination requests sent via AJAX.
+ *
+ * @since BuddyPress (2.0.0)
+ */
+function bp_legacy_theme_membership_requests_template_loader() {
+        bp_get_template_part( 'groups/single/admin-requests-loop' );
+        exit();
+}
+
+/**
  * Load the activity loop template when activity is requested via AJAX,
  *
  * @return string JSON object containing 'contents' (output of the template loop

bp-templates/bp-legacy/buddypress/groups/single/admin.php

@@ -303 +303 @@
 
         <?php do_action( 'bp_before_group_membership_requests_admin' ); ?>
 
-        <?php if ( bp_group_has_membership_requests() ) : ?>
+                <div class="membership_requests">
 
-                <ul id="request-list" class="item-list">
-                        <?php while ( bp_group_membership_requests() ) : bp_group_the_membership_request(); ?>
+                        <?php bp_get_template_part( 'groups/single/admin-requests-loop' ); ?>
 
-                                <li>
-                                        <?php bp_group_request_user_avatar_thumb(); ?>
-                                        <h4><?php bp_group_request_user_link(); ?> <span class="comments"><?php bp_group_request_comment(); ?></span></h4>
-                                        <span class="activity"><?php bp_group_request_time_since_requested(); ?></span>
-
-                                        <?php do_action( 'bp_group_membership_requests_admin_item' ); ?>
-
-                                        <div class="action">
-
-                                                <?php bp_button( array( 'id' => 'group_membership_accept', 'component' => 'groups', 'wrapper_class' => 'accept', 'link_href' => bp_get_group_request_accept_link(), 'link_title' => __( 'Accept', 'buddypress' ), 'link_text' => __( 'Accept', 'buddypress' ) ) ); ?>
-
-                                                <?php bp_button( array( 'id' => 'group_membership_reject', 'component' => 'groups', 'wrapper_class' => 'reject', 'link_href' => bp_get_group_request_reject_link(), 'link_title' => __( 'Reject', 'buddypress' ), 'link_text' => __( 'Reject', 'buddypress' ) ) ); ?>
-
-                                                <?php do_action( 'bp_group_membership_requests_admin_item_action' ); ?>
-
-                                        </div>
-                                </li>
-
-                        <?php endwhile; ?>
-                </ul>
-
-        <?php else: ?>
-
-                <div id="message" class="info">
-                        <p><?php _e( 'There are no pending membership requests.', 'buddypress' ); ?></p>
                 </div>
 
-        <?php endif; ?>
-
         <?php do_action( 'bp_after_group_membership_requests_admin' ); ?>
 
 <?php endif; ?>

bp-templates/bp-legacy/js/buddypress.js

@@ -853 +853 @@
                                 template = 'groups/single/members';
                         }
 
+                        // On the Admin > Requests page, we need to reset the object, since "admin" isn't helpful
+                        if ( 'admin' == object && jq('body').hasClass('membership-requests') ) {
+                                object = 'membership_requests';
+                        }
+
                         if ( pagination_id.indexOf( 'pag-bottom' ) !== -1 ) {
                                 var caller = 'pag-bottom';
                         } else {