<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[BuddyPress][8150] trunk: Add AJAX-powered pagination for group membership requests admin pages</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://buddypress.trac.wordpress.org/changeset/8150">8150</a></dd>
<dt>Author</dt> <dd>boonebgorges</dd>
<dt>Date</dt> <dd>2014-03-24 19:11:16 +0000 (Mon, 24 Mar 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Add AJAX-powered pagination for group membership requests admin pages
Fixes <a href="http://buddypress.trac.wordpress.org/ticket/5440">#5440</a>
Props dcavins</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkbpgroupsbpgroupstemplatephp">trunk/bp-groups/bp-groups-template.php</a></li>
<li><a href="#trunkbptemplatesbplegacybuddypressgroupssingleadminphp">trunk/bp-templates/bp-legacy/buddypress/groups/single/admin.php</a></li>
<li><a href="#trunkbptemplatesbplegacybuddypressfunctionsphp">trunk/bp-templates/bp-legacy/buddypress-functions.php</a></li>
<li><a href="#trunkbptemplatesbplegacyjsbuddypressjs">trunk/bp-templates/bp-legacy/js/buddypress.js</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkbptemplatesbplegacybuddypressgroupssinglerequestsloopphp">trunk/bp-templates/bp-legacy/buddypress/groups/single/requests-loop.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkbpgroupsbpgroupstemplatephp"></a>
<div class="modfile"><h4>Modified: trunk/bp-groups/bp-groups-template.php (8149 => 8150)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-groups/bp-groups-template.php 2014-03-20 23:14:32 UTC (rev 8149)
+++ trunk/bp-groups/bp-groups-template.php 2014-03-24 19:11:16 UTC (rev 8150)
</span><span class="lines">@@ -3073,10 +3073,10 @@
</span><span class="cx"> * @return bool True if there are requests, otherwise false.
</span><span class="cx"> */
</span><span class="cx"> function bp_group_has_membership_requests( $args = '' ) {
</span><del>- global $requests_template, $groups_template;
</del><ins>+ global $requests_template;
</ins><span class="cx">
</span><span class="cx"> $defaults = array(
</span><del>- 'group_id' => $groups_template->group->id,
</del><ins>+ 'group_id' => bp_get_current_group_id(),
</ins><span class="cx"> 'per_page' => 10,
</span><span class="cx"> 'page' => 1,
</span><span class="cx"> 'max' => false
</span><span class="lines">@@ -3110,18 +3110,18 @@
</span><span class="cx"> echo bp_get_group_request_reject_link();
</span><span class="cx"> }
</span><span class="cx"> function bp_get_group_request_reject_link() {
</span><del>- global $requests_template, $groups_template;
</del><ins>+ global $requests_template;
</ins><span class="cx">
</span><del>- 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' ) );
</del><ins>+ 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' ) );
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> function bp_group_request_accept_link() {
</span><span class="cx"> echo bp_get_group_request_accept_link();
</span><span class="cx"> }
</span><span class="cx"> function bp_get_group_request_accept_link() {
</span><del>- global $requests_template, $groups_template;
</del><ins>+ global $requests_template;
</ins><span class="cx">
</span><del>- 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' ) );
</del><ins>+ 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' ) );
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> function bp_group_request_user_link() {
</span><span class="lines">@@ -3145,6 +3145,52 @@
</span><span class="cx"> echo apply_filters( 'bp_group_request_comment', strip_tags( stripslashes( $requests_template->request->comments ) ) );
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+/**
+ * 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 );
+ }
+
</ins><span class="cx"> /************************************************************************************
</span><span class="cx"> * Invite Friends Template Tags
</span><span class="cx"> **/
</span></span></pre></div>
<a id="trunkbptemplatesbplegacybuddypressgroupssingleadminphp"></a>
<div class="modfile"><h4>Modified: trunk/bp-templates/bp-legacy/buddypress/groups/single/admin.php (8149 => 8150)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-templates/bp-legacy/buddypress/groups/single/admin.php 2014-03-20 23:14:32 UTC (rev 8149)
+++ trunk/bp-templates/bp-legacy/buddypress/groups/single/admin.php 2014-03-24 19:11:16 UTC (rev 8150)
</span><span class="lines">@@ -303,40 +303,12 @@
</span><span class="cx">
</span><span class="cx"> <?php do_action( 'bp_before_group_membership_requests_admin' ); ?>
</span><span class="cx">
</span><del>- <?php if ( bp_group_has_membership_requests() ) : ?>
</del><ins>+ <div class="requests">
</ins><span class="cx">
</span><del>- <ul id="request-list" class="item-list">
- <?php while ( bp_group_membership_requests() ) : bp_group_the_membership_request(); ?>
</del><ins>+ <?php bp_get_template_part( 'groups/single/requests-loop' ); ?>
</ins><span class="cx">
</span><del>- <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>
</del><span class="cx"> </div>
</span><span class="cx">
</span><del>- <?php endif; ?>
-
</del><span class="cx"> <?php do_action( 'bp_after_group_membership_requests_admin' ); ?>
</span><span class="cx">
</span><span class="cx"> <?php endif; ?>
</span></span></pre></div>
<a id="trunkbptemplatesbplegacybuddypressgroupssinglerequestsloopphp"></a>
<div class="addfile"><h4>Added: trunk/bp-templates/bp-legacy/buddypress/groups/single/requests-loop.php (0 => 8150)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-templates/bp-legacy/buddypress/groups/single/requests-loop.php (rev 0)
+++ trunk/bp-templates/bp-legacy/buddypress/groups/single/requests-loop.php 2014-03-24 19:11:16 UTC (rev 8150)
</span><span class="lines">@@ -0,0 +1,65 @@
</span><ins>+<?php if ( bp_group_has_membership_requests( bp_ajax_querystring( 'membership_requests' ) ) ) : ?>
+
+ <div id="pag-top" class="pagination">
+
+ <div class="pag-count" id="group-mem-requests-count-top">
+
+ <?php bp_group_requests_pagination_count(); ?>
+
+ </div>
+
+ <div class="pagination-links" id="group-mem-requests-pag-top">
+
+ <?php bp_group_requests_pagination_links(); ?>
+
+ </div>
+
+ </div>
+
+ <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>
+
+ <div id="pag-bottom" class="pagination">
+
+ <div class="pag-count" id="group-mem-requests-count-bottom">
+
+ <?php bp_group_requests_pagination_count(); ?>
+
+ </div>
+
+ <div class="pagination-links" id="group-mem-requests-pag-bottom">
+
+ <?php bp_group_requests_pagination_links(); ?>
+
+ </div>
+
+ </div>
+
+ <?php else: ?>
+
+ <div id="message" class="info">
+ <p><?php _e( 'There are no pending membership requests.', 'buddypress' ); ?></p>
+ </div>
+
+ <?php endif; ?>
</ins></span></pre></div>
<a id="trunkbptemplatesbplegacybuddypressfunctionsphp"></a>
<div class="modfile"><h4>Modified: trunk/bp-templates/bp-legacy/buddypress-functions.php (8149 => 8150)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-templates/bp-legacy/buddypress-functions.php 2014-03-20 23:14:32 UTC (rev 8149)
+++ trunk/bp-templates/bp-legacy/buddypress-functions.php 2014-03-24 19:11:16 UTC (rev 8150)
</span><span class="lines">@@ -140,6 +140,7 @@
</span><span class="cx"> 'members_filter' => 'bp_legacy_theme_object_template_loader',
</span><span class="cx"> 'messages_filter' => 'bp_legacy_theme_messages_template_loader',
</span><span class="cx"> 'invite_filter' => 'bp_legacy_theme_invite_template_loader',
</span><ins>+ 'requests_filter' => 'bp_legacy_theme_requests_template_loader',
</ins><span class="cx">
</span><span class="cx"> // Friends
</span><span class="cx"> 'accept_friendship' => 'bp_legacy_theme_ajax_accept_friendship',
</span><span class="lines">@@ -612,6 +613,16 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> /**
</span><ins>+ * 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();
+}
+
+/**
</ins><span class="cx"> * Load the activity loop template when activity is requested via AJAX,
</span><span class="cx"> *
</span><span class="cx"> * @return string JSON object containing 'contents' (output of the template loop
</span></span></pre></div>
<a id="trunkbptemplatesbplegacyjsbuddypressjs"></a>
<div class="modfile"><h4>Modified: trunk/bp-templates/bp-legacy/js/buddypress.js (8149 => 8150)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-templates/bp-legacy/js/buddypress.js 2014-03-20 23:14:32 UTC (rev 8149)
+++ trunk/bp-templates/bp-legacy/js/buddypress.js 2014-03-24 19:11:16 UTC (rev 8150)
</span><span class="lines">@@ -853,6 +853,12 @@
</span><span class="cx"> template = 'groups/single/members';
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+ // 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';
+ }
+
</ins><span class="cx"> if ( pagination_id.indexOf( 'pag-bottom' ) !== -1 ) {
</span><span class="cx"> var caller = 'pag-bottom';
</span><span class="cx"> } else {
</span></span></pre>
</div>
</div>
</body>
</html>