Changeset 12322

Timestamp:

01/10/2019 07:57:41 PM (6 years ago)

Author:

boonebgorges

Message:

Nouveau: Fixes for the Friends Request page.

The Friends Request page was introduced in Nouveau with the same dropdown
filter as on other member directories, but the functionality was never
fully implemented. In this changeset, we make the following changes:

• Ensure that the AJAX request distinguishes between friend request queries and other membership queries, so that the members returned are limited to friend requests.
• Break the friend request loop logic into its own template, so that the outer template information (title, pagination, etc) doesn't appear twice after an AJAX filter.
• Modify the logic in the friend-request template so that it uses bp_ajax_querystring(), which lets the filters affect the returned results.

Props imath.
Fixes #8035.

Location:

trunk/src/bp-templates/bp-nouveau

Files:

• buddypress/members/single/friends/requests-loop.php (copied) (copied from trunk/src/bp-templates/bp-nouveau/buddypress/members/single/friends/requests.php) (2 diffs)
• buddypress/members/single/friends/requests.php (modified) (2 diffs)
• includes/ajax.php (modified) (1 diff)
• includes/template-tags.php (modified) (1 diff)
• js/buddypress-nouveau.js (modified) (2 diffs)

trunk/src/bp-templates/bp-nouveau/buddypress/members/single/friends/requests-loop.php

@@ -1 +1 @@
 <?php
 /**
- * BuddyPress - Members Friends Requests
+ * BuddyPress - Members Friends Requests Loop
  *
- * @since 3.0.0
- * @version 3.0.0
+ * @since 5.0.0
+ * @version 5.0.0
  */
 ?>
 
-<h2 class="screen-heading friendship-requests-screen"><?php esc_html_e( 'Friendship Requests', 'buddypress' ); ?></h2>
-
-<?php bp_nouveau_member_hook( 'before', 'friend_requests_content' ); ?>
-
-<?php if ( bp_has_members( 'type=alphabetical&include=' . bp_get_friendship_requests() ) ) : ?>
+<?php if ( bp_has_members( bp_ajax_querystring( 'friendship_requests' ) . '&include=' . bp_get_friendship_requests() ) ) : ?>
 
     <?php bp_nouveau_pagination( 'top' ); ?>
 
-    <ul id="friend-list" class="<?php bp_nouveau_loop_classes(); ?>" data-bp-list="friendship_requests">
+    <ul id="friend-list" class="<?php bp_nouveau_loop_classes(); ?>">
         <?php
         while ( bp_members() ) :
@@ -49 +45 @@
 
 <?php endif; ?>
-
-<?php
-bp_nouveau_member_hook( 'after', 'friend_requests_content' );

trunk/src/bp-templates/bp-nouveau/buddypress/members/single/friends/requests.php

@@ -4 +4 @@
  *
  * @since 3.0.0
- * @version 3.0.0
+ * @version 5.0.0
  */
 ?>
@@ -12 +12 @@
 <?php bp_nouveau_member_hook( 'before', 'friend_requests_content' ); ?>
 
-<?php if ( bp_has_members( 'type=alphabetical&include=' . bp_get_friendship_requests() ) ) : ?>
+<div data-bp-list="friendship_requests">
+    <?php bp_get_template_part( 'members/single/friends/requests-loop' ); ?>
+</div>
 
-    <?php bp_nouveau_pagination( 'top' ); ?>
-
-    <ul id="friend-list" class="<?php bp_nouveau_loop_classes(); ?>" data-bp-list="friendship_requests">
-        <?php
-        while ( bp_members() ) :
-            bp_the_member();
-        ?>
-
-            <li id="friendship-<?php bp_friend_friendship_id(); ?>" <?php bp_member_class( array( 'item-entry' ) ); ?> data-bp-item-id="<?php bp_friend_friendship_id(); ?>" data-bp-item-component="members">
-                <div class="item-avatar">
-                    <a href="<?php bp_member_link(); ?>"><?php bp_member_avatar( array( 'type' => 'full' ) ); ?></a>
-                </div>
-
-                <div class="item">
-                    <div class="item-title"><a href="<?php bp_member_link(); ?>"><?php bp_member_name(); ?></a></div>
-                    <div class="item-meta"><span class="activity"><?php bp_member_last_active(); ?></span></div>
-
-                    <?php bp_nouveau_friend_hook( 'requests_item' ); ?>
-                </div>
-
-                <?php bp_nouveau_members_loop_buttons(); ?>
-            </li>
-
-        <?php endwhile; ?>
-    </ul>
-
-    <?php bp_nouveau_friend_hook( 'requests_content' ); ?>
-
-    <?php bp_nouveau_pagination( 'bottom' ); ?>
-
-<?php else : ?>
-
-    <?php bp_nouveau_user_feedback( 'member-requests-none' ); ?>
-
-<?php endif; ?>
-
-<?php
-bp_nouveau_member_hook( 'after', 'friend_requests_content' );
+<?php bp_nouveau_member_hook( 'after', 'friend_requests_content' );

trunk/src/bp-templates/bp-nouveau/includes/ajax.php

@@ -111 +111 @@
         break;
 
+        case 'friend_requests' :
+            $template_part = 'members/single/friends/requests-loop.php';
+        break;
+
         case 'member_notifications' :
             $template_part = 'members/single/notifications/notifications-loop.php';

trunk/src/bp-templates/bp-nouveau/includes/template-tags.php

@@ -1989 +1989 @@
 
     } else {
+        $data_filter = bp_current_component();
+        if ( 'friends' === $data_filter && bp_is_user_friend_requests() ) {
+            $data_filter = 'friend_requests';
+        }
+
         $component['members_select']   = 'members-order-select';
         $component['members_order_by'] = 'members-order-by';
         $component['object']           = bp_current_component();
-        $component['data_filter']      = bp_current_component();
+        $component['data_filter']      = $data_filter;
     }
 

trunk/src/bp-templates/bp-nouveau/js/buddypress-nouveau.js

@@ -286 +286 @@
             $( '#buddypress [data-bp-filter="' + data.object + '"] option[value="' + data.filter + '"]' ).prop( 'selected', true );
 
-            if ( 'friends' === data.object || 'group_members' === data.object ) {
+            if ( 'friends' === data.object || 'friend_requests' === data.object || 'group_members' === data.object ) {
                 data.template = data.object;
                 data.object   = 'members';
@@ -573 +573 @@
             if ( $( '#buddypress [data-bp-search="' + object + '"] input[type=search]' ).length ) {
                 search_terms = $( '#buddypress [data-bp-search="' + object + '"] input[type=search]' ).val();
-            }
-
-            if ( 'friends' === object ) {
-                object = 'members';
             }