Changeset 8150

Timestamp:

03/24/2014 07:11:16 PM (11 years ago)

Author:

boonebgorges

Message:

Add AJAX-powered pagination for group membership requests admin pages

Fixes #5440

Props dcavins

Location:

trunk

Files:

• bp-groups/bp-groups-template.php (modified) (4 diffs)
• bp-templates/bp-legacy/buddypress-functions.php (modified) (2 diffs)
• bp-templates/bp-legacy/buddypress/groups/single/admin.php (modified) (1 diff)
• bp-templates/bp-legacy/buddypress/groups/single/requests-loop.php (added)
• bp-templates/bp-legacy/js/buddypress.js (modified) (1 diff)

trunk/bp-groups/bp-groups-template.php

@@ -3074 +3074 @@
  */
 function bp_group_has_membership_requests( $args = '' ) {
-    global $requests_template, $groups_template;
+    global $requests_template;
 
     $defaults = array(
-        'group_id' => $groups_template->group->id,
+        'group_id' => bp_get_current_group_id(),
         'per_page' => 10,
         'page'     => 1,
@@ -3111 +3111 @@
 }
     function bp_get_group_request_reject_link() {
-        global $requests_template, $groups_template;
-
-        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' ) );
+        global $requests_template;
+
+        return apply_filters( 'bp_get_group_request_reject_link', wp_nonce_url( bp_get_group_permalink( groups_get_current_group() ) . 'admin/membership-requests/reject/' . $requests_template->request->membership_id, 'groups_reject_membership_request' ) );
     }
 
@@ -3120 +3120 @@
 }
     function bp_get_group_request_accept_link() {
-        global $requests_template, $groups_template;
-
-        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' ) );
+        global $requests_template;
+
+        return apply_filters( 'bp_get_group_request_accept_link', wp_nonce_url( bp_get_group_permalink( groups_get_current_group() ) . 'admin/membership-requests/accept/' . $requests_template->request->membership_id, 'groups_accept_membership_request' ) );
     }
 
@@ -3145 +3145 @@
     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_requests_pagination_links() {
+    echo bp_get_group_requests_pagination_links();
+}
+    /**
+     * Get pagination links for group membership requests.
+     *
+     * @since BuddyPress (2.0.0)
+     *
+     * @return string
+     */
+    function bp_get_group_requests_pagination_links() {
+        global $requests_template;
+        return apply_filters( 'bp_get_group_requests_pagination_links', $requests_template->pag_links );
+    }
+
+/**
+ * Output pagination count text for group membership requests.
+ *
+ * @since BuddyPress (2.0.0)
+ */
+function bp_group_requests_pagination_count() {
+    echo bp_get_group_requests_pagination_count();
+}
+    /**
+     * Get pagination count text for group membership requests.
+     *
+     * @since BuddyPress (2.0.0)
+     *
+     * @return string
+     */
+    function bp_get_group_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_group_requests_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 );
+    }
 
 /************************************************************************************

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

@@ -141 +141 @@
             'messages_filter' => 'bp_legacy_theme_messages_template_loader',
             'invite_filter'   => 'bp_legacy_theme_invite_template_loader',
+            'requests_filter' => 'bp_legacy_theme_requests_template_loader',
 
             // Friends
@@ -613 +614 @@
 
 /**
+ * Load group membership requests loop to handle pagination requests sent via AJAX.
+ *
+ * @since BuddyPress (2.0.0)
+ */
+function bp_legacy_theme_requests_template_loader() {
+    bp_get_template_part( 'groups/single/requests-loop' );
+    exit();
+}
+
+/**
  * Load the activity loop template when activity is requested via AJAX,
  *

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

@@ -304 +304 @@
     <?php do_action( 'bp_before_group_membership_requests_admin' ); ?>
 
-    <?php if ( bp_group_has_membership_requests() ) : ?>
-
-        <ul id="request-list" class="item-list">
-            <?php while ( bp_group_membership_requests() ) : bp_group_the_membership_request(); ?>
-
-                <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 class="requests">
+
+            <?php bp_get_template_part( 'groups/single/requests-loop' ); ?>
+
         </div>
-
-    <?php endif; ?>
 
     <?php do_action( 'bp_after_group_membership_requests_admin' ); ?>

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

@@ -852 +852 @@
                 object = 'group_members';
                 template = 'groups/single/members';
+            }
+
+            // On the Admin > Requests page, we need to reset the object,
+            // since "admin" isn't specific enough
+            if ( 'admin' == object && jq( 'body' ).hasClass( 'membership-requests' ) ) {
+                object = 'requests';
             }