Changeset 11876

Timestamp:

03/04/2018 01:59:40 PM (7 years ago)

Author:

djpaul

Message:

Nouveau: fix AJAX template loading.

r11821 broke the loading of some AJAX templates in Nouveau. Specifically, the backward compatibility in it was focused only on the group_members special case from bp-legacy, but Nouveau uses the template parameter in more places.

Fixes #7689

Props boonebgorges

Location:

trunk/src/bp-templates/bp-nouveau

Files:

• includes/ajax.php (modified) (1 diff)
• js/buddypress-notifications.js (modified) (1 diff)
• js/buddypress-nouveau.js (modified) (5 diffs)

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

@@ -88 +88 @@
     }
 
-    // The template part can be overridden by the calling JS function.
-    if ( ! empty( $_POST['template'] ) && 'groups/single/members' === $_POST['template'] && 'group_members' === $object ) {
-        $template_part = 'groups/single/members.php';
-    } else {
-        $template_part = $object . '/' . $object . '-loop.php';
+    // Get the template path based on the 'template' variable via the AJAX request.
+    $template = isset( $_POST['template'] ) ? wp_unslash( $_POST['template'] ) : '';
+
+    switch ( $template ) {
+        case 'group_members' :
+        case 'groups/single/members' :
+            $template_part = 'groups/single/members-loop.php';
+        break;
+
+        case 'group_requests' :
+            $template_part = 'groups/single/requests-loop.php';
+        break;
+
+        case 'member_notifications' :
+            $template_part = 'members/single/notifications/notifications-loop.php';
+        break;
+
+        default :
+            $template_part = $object . '/' . $object . '-loop.php';
+        break;
     }
 

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

@@ -101 +101 @@
                 search_terms        : search_terms,
                 extras              : sort,
-                page                : 1,
-                template            : 'members/single/notifications/notifications-loop'
+                page                : 1
             } );
         },

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

@@ -327 +327 @@
             if ( 'friends' === data.object || 'group_members' === data.object ) {
                 data.object = 'members';
+                data.template = data.object;
             } else if ( 'group_requests' === data.object ) {
                 data.object = 'groups';
+                data.template = 'group_requests';
+            } else if ( 'notifications' === data.object ) {
+                data.object = 'members';
+                data.template = 'member_notifications';
             }
 
@@ -431 +436 @@
                     };
 
-                    if ( 'group_members' === object ) {
-                        $.extend( queryData, { template: 'groups/single/members-loop' } );
-                    } else if ( 'group_requests' === object ) {
-                        $.extend( queryData, { template: 'groups/single/requests-loop' } );
-                    } else if ( 'notifications' === object ) {
-                        $.extend( queryData, { template: 'members/single/notifications/notifications-loop' } );
-                    }
-
                     // Populate the object list
                     self.objectRequest( queryData );
@@ -616 +613 @@
             if ( $( '#buddypress [data-bp-search="' + object + '"] input[type=search]' ).length ) {
                 search_terms = $( '#buddypress [data-bp-search="' + object + '"] input[type=search]' ).val();
-            }
-
-            // On the Groups Members page, we specify a template
-            if ( 'group_members' === object ) {
-                template = 'groups/single/members-loop';
-            }
-
-            // On the Members notifications page, we specify a template
-            if ( 'notifications' === object ) {
-                template = 'members/single/notifications/notifications-loop';
             }
 
@@ -663 +650 @@
             if ( $( self.objectNavParent + ' [data-bp-object]' ).length ) {
                 scope = $( self.objectNavParent + ' [data-bp-object="' + object + '"].selected' ).data( 'bp-scope' );
-            }
-
-            if ( 'group_members' === object ) {
-                template = 'groups/single/members-loop';
-            }
-
-            if ( 'notifications' === object ) {
-                template = 'members/single/notifications/notifications-loop';
             }
 
@@ -896 +875 @@
             };
 
-            if ( 'group_members' === object ) {
-                $.extend( queryData, { template: 'groups/single/members-loop' } );
-            } else if ( 'group_requests' === object ) {
-                $.extend( queryData, { template: 'groups/single/requests-loop' } );
-            } else if ( 'notifications' === object ) {
-                $.extend( queryData, { template: 'members/single/notifications/notifications-loop' } );
-            }
-
             // Request the page
             self.objectRequest( queryData );