Changeset 12225

Timestamp:

09/07/2018 02:09:08 PM (7 years ago)

Author:

djpaul

Message:

Nouveau: fix filtering Member Directory when specified by user type.

This is a problem we had with BP-Legacy's JS, and as it seems this part was
copied into Nouveau, we are implementing the same fix here. This involves not
using Javascript filtering for the Member Directory filters when a user type
is set.

A better fix would be to rewrite the Javascript to solve the underlying issue.

Fixes #7903 (3.0.x branch)

Props imath

Location:

branches/3.0/src

Files:

• bp-core/bp-core-template.php (modified) (1 diff)
• bp-templates/bp-nouveau/includes/template-tags.php (modified) (2 diffs)

branches/3.0/src/bp-core/bp-core-template.php

@@ -3246 +3246 @@
             }
         } else {
-            if ( bp_get_current_member_type() ) {
+            if ( bp_get_current_member_type() || ( bp_is_groups_directory() && bp_get_current_group_directory_type() ) ) {
                 $bp_classes[] = 'type';
             }

branches/3.0/src/bp-templates/bp-nouveau/includes/template-tags.php

@@ -4 +4 @@
  *
  * @since 3.0.0
- * @version 3.1.0
+ * @version 3.2.0
  */
 
@@ -908 +908 @@
         $classes    = array();
 
-        if ( 'directory' === $bp_nouveau->displayed_nav && ! empty( $nav_item->li_class ) ) {
-            $classes = (array) $nav_item->li_class;
+        if ( 'directory' === $bp_nouveau->displayed_nav ) {
+            if ( ! empty( $nav_item->li_class ) ) {
+                $classes = (array) $nav_item->li_class;
+            }
+
+            if ( bp_get_current_member_type() || ( bp_is_groups_directory() && bp_get_current_group_directory_type() ) ) {
+                $classes[] = 'no-ajax';
+            }
         } elseif ( 'groups' === $bp_nouveau->displayed_nav || 'personal' === $bp_nouveau->displayed_nav ) {
             $classes  = array( 'bp-' . $bp_nouveau->displayed_nav . '-tab' );