Ticket #5423: 5423.06.patch

bp-groups/bp-groups-template.php

@@ -3312 +3312 @@
                 return wp_nonce_url( site_url( bp_get_groups_slug() . '/' . $invites_template->invite->group_id . '/invites/remove/' . $invites_template->invite->user->id ), 'groups_invite_uninvite_user' );
         }
 
+/**
+ * Output pagination links for group invitations.
+ *
+ * @since BuddyPress (2.0.0)
+ */
+function bp_group_invite_pagination_links() {
+        echo bp_get_group_invite_pagination_links();
+}
+        /**
+         * Get pagination links for group invitations.
+         *
+         * @since BuddyPress (2.0.0)
+         */
+        function bp_get_group_invite_pagination_links() {
+                global $invites_template;
+                return apply_filters( 'bp_get_group_invite_pagination_links', $invites_template->pag_links );
+        }
+
+/**
+ * Output pagination count text for group invitations.
+ *
+ * @since BuddyPress (2.0.0)
+ */
+function bp_group_invite_pagination_count() {
+        echo bp_get_group_invite_pagination_count();
+}
+        /**
+         * Get pagination count text for group invitations.
+         *
+         * @since BuddyPress (2.0.0)
+         */
+        function bp_get_group_invite_pagination_count() {
+                global $invites_template;
+
+                $start_num = intval( ( $invites_template->pag_page - 1 ) * $invites_template->pag_num ) + 1;
+                $from_num  = bp_core_number_format( $start_num );
+                $to_num    = bp_core_number_format( ( $start_num + ( $invites_template->pag_num - 1 ) > $invites_template->total_invite_count ) ? $invites_template->total_invite_count : $start_num + ( $invites_template->pag_num - 1 ) );
+                $total     = bp_core_number_format( $invites_template->total_invite_count );
+
+                return apply_filters( 'bp_get_groups_pagination_count', sprintf( _n( 'Viewing invitation %1$s to %2$s (of %3$s invitation)', 'Viewing invitation %1$s to %2$s (of %3$s invitations)', $total, 'buddypress' ), $from_num, $to_num, $total ), $from_num, $to_num, $total );
+        }
+
 /***
  * Groups RSS Feed Template Tags
  */

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

@@ -139 +139 @@
                         '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',
 
                         // Friends
                         'accept_friendship' => 'bp_legacy_theme_ajax_accept_friendship',
@@ -601 +602 @@
 }
 
 /**
+ * Load group invitations loop to handle pagination requests sent via AJAX.
+ *
+ * @since BuddyPress (2.0.0)
+ */
+function bp_legacy_theme_invite_template_loader() {
+        bp_get_template_part( 'groups/single/invites-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/send-invites.php

@@ -2 +2 @@
 
 <?php if ( bp_get_total_friend_count( bp_loggedin_user_id() ) ) : ?>
 
+        <?php /* 'send-invite-form' is important for AJAX support */ ?>
         <form action="<?php bp_group_send_invite_form_action(); ?>" method="post" id="send-invite-form" class="standard-form" role="main">
 
-                <div class="left-menu">
+                <div class="invite">
 
-                        <div id="invite-list">
-                                <ul>
-                                        <?php bp_new_group_invite_friend_list(); ?>
-                                </ul>
+                        <?php bp_get_template_part( 'groups/single/invites-loop' ); ?>
 
-                                <?php wp_nonce_field( 'groups_invite_uninvite_user', '_wpnonce_invite_uninvite_user' ); ?>
-                        </div>
-
-                </div><!-- .left-menu -->
-
-                <div class="main-column">
-
-                        <div id="message" class="info">
-                                <p><?php _e('Select people to invite from your friends list.', 'buddypress' ); ?></p>
-                        </div>
-
-                        <?php do_action( 'bp_before_group_send_invites_list' ); ?>
-
-                        <?php /* The ID 'friend-list' is important for AJAX support. */ ?>
-                        <ul id="friend-list" class="item-list">
-                        <?php if ( bp_group_has_invites() ) : ?>
-
-                                <?php while ( bp_group_invites() ) : bp_group_the_invite(); ?>
-
-                                        <li id="<?php bp_group_invite_item_id(); ?>">
-                                                <?php bp_group_invite_user_avatar(); ?>
-
-                                                <h4><?php bp_group_invite_user_link(); ?></h4>
-                                                <span class="activity"><?php bp_group_invite_user_last_active(); ?></span>
-
-                                                <?php do_action( 'bp_group_send_invites_item' ); ?>
-
-                                                <div class="action">
-                                                        <a class="button remove" href="<?php bp_group_invite_user_remove_invite_url(); ?>" id="<?php bp_group_invite_item_id(); ?>"><?php _e( 'Remove Invite', 'buddypress' ); ?></a>
-
-                                                        <?php do_action( 'bp_group_send_invites_item_action' ); ?>
-                                                </div>
-                                        </li>
-
-                                <?php endwhile; ?>
-
-                        <?php endif; ?>
-                        </ul><!-- #friend-list -->
-
-                        <?php do_action( 'bp_after_group_send_invites_list' ); ?>
-
-                </div><!-- .main-column -->
-
-                <div class="clear"></div>
-
-                <div class="submit">
-                        <input type="submit" name="submit" id="submit" value="<?php esc_attr_e( 'Send Invites', 'buddypress' ); ?>" />
                 </div>
 
-                <?php wp_nonce_field( 'groups_send_invites', '_wpnonce_send_invites' ); ?>
-
                 <?php /* This is important, don't forget it */ ?>
                 <input type="hidden" name="group_id" id="group_id" value="<?php bp_group_id(); ?>" />
 
         </form><!-- #send-invite-form -->
 
-<?php else : ?>
-
-        <div id="message" class="info" role="main">
-                <p><?php _e( 'Once you have built up friend connections you will be able to invite others to your group.', 'buddypress' ); ?></p>
-        </div>
-
 <?php endif; ?>
 
 <?php do_action( 'bp_after_group_send_invites_content' ); ?>

bp-templates/bp-legacy/css/buddypress.css

@@ -764 +764 @@
 
 #buddypress form.standard-form .main-column ul#friend-list {
         clear:none;
+        float: left;
 }
 
 #buddypress form.standard-form .main-column ul#friend-list h4 {
@@ -1087 +1088 @@
         background-color: #ffd;
         border: 1px solid #cb2;
         color: #440;
-        
+
 }
 #buddypress div#item-header {
         overflow: hidden;

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

@@ -901 +901 @@
         /** Invite Friends Interface ****************************************/
 
         /* Select a user from the list of friends and add them to the invite list */
-        jq("#invite-list input").on( 'click', function() {
+        jq("#send-invite-form").on( 'click', '#invite-list input', function() {
+                // New template contains a div with the class of invite that's a first-level child of the form. Old template doesn't.
+                var invites_new_template = jq("#send-invite-form > invite").length;
+
                 jq('.ajax-loader').toggle();
 
+                // Dim the form until the response arrives
+                if ( invites_new_template )
+                        jq( this ).parents( 'ul' ).find( 'input' ).prop( 'disabled', true );
+
                 var friend_id = jq(this).val();
 
                 if ( jq(this).prop('checked') == true )
@@ -911 +918 @@
                 else
                         var friend_action = 'uninvite';
 
-                jq('.item-list-tabs li.selected').addClass('loading');
+                if ( ! invites_new_template )
+                        jq('.item-list-tabs li.selected').addClass('loading');
 
                 jq.post( ajaxurl, {
                         action: 'groups_invite_user',
@@ -926 +934 @@
                         if ( jq("#message") )
                                 jq("#message").hide();
 
-                        jq('.ajax-loader').toggle();
+                        if ( invites_new_template ) {
+                                // Refresh entire list (keeps pagination and totals up to date)
+                                bp_filter_request( 'invite', 'bp-invite-filter', 'bp-invite-scope', 'div.invite', false, 1, '', '', '' );
+                        } else {
+                                jq('.ajax-loader').toggle();
 
-                        if ( friend_action == 'invite' ) {
-                                jq('#friend-list').append(response);
-                        } else if ( friend_action == 'uninvite' ) {
-                                jq('#friend-list li#uid-' + friend_id).remove();
-                        }
+                                if ( friend_action == 'invite' ) {
+                                        jq('#friend-list').append(response);
+                                } else if ( friend_action == 'uninvite' ) {
+                                        jq('#friend-list li#uid-' + friend_id).remove();
+                                }
 
-                        jq('.item-list-tabs li.selected').removeClass('loading');
+                                jq('.item-list-tabs li.selected').removeClass('loading');
+                        }
                 });
         });
 
         /* Remove a user from the list of users to invite to a group */
-        jq("#friend-list").on('click', 'li a.remove', function() {
+        jq("#send-invite-form").on('click', 'a.remove', function() {
+                // New template contains a div with the class of invite that's a first-level child of the form. Old template doesn't.
+                var invites_new_template = jq("#send-invite-form > invite").length;
+
                 jq('.ajax-loader').toggle();
 
                 var friend_id = jq(this).attr('id');
@@ -956 +972 @@
                 },
                 function(response)
                 {
-                        jq('.ajax-loader').toggle();
-                        jq('#friend-list #uid-' + friend_id).remove();
-                        jq('#invite-list #f-' + friend_id).prop('checked', false);
+                        if ( invites_new_template ) {
+                                // Refresh entire list (keeps pagination and totals up to date)
+                                bp_filter_request( 'invite', 'bp-invite-filter', 'bp-invite-scope', 'div.invite', false, 1, '', '', '' );
+                        } else {
+                                jq('.ajax-loader').toggle();
+                                jq('#friend-list #uid-' + friend_id).remove();
+                                jq('#invite-list #f-' + friend_id).prop('checked', false);
+                        }
                 });
 
                 return false;