Changeset 11405

Timestamp:

01/31/2017 08:31:10 PM (8 years ago)

Author:

r-a-y

Message:

Groups: Fix AJAX pagination when on a group type directory page.

This commit moves group type directory detection from the
'template_redirect' hook to our groups component class to ensure
detection is available for AJAX purposes.

Commit also changes invalid group type directory requests to 404 instead
of redirecting back to the main Groups directory.

Props r-a-y, dcavins.

Fixes #7423.

Location:

trunk

Files:

• src/bp-groups/bp-groups-screens.php (modified) (1 diff)
• src/bp-groups/classes/class-bp-groups-component.php (modified) (2 diffs)
• tests/phpunit/testcases/routing/groups.php (modified) (1 diff)

trunk/src/bp-groups/bp-groups-screens.php

@@ -22 +22 @@
 function groups_directory_groups_setup() {
     if ( bp_is_groups_directory() ) {
-        // Set group type if available.
-        if ( bp_is_current_action( bp_get_groups_group_type_base() ) && bp_action_variable() ) {
-            $matched_types = bp_groups_get_group_types( array(
-                'has_directory'  => true,
-                'directory_slug' => bp_action_variable(),
-            ) );
-
-            // Redirect back to group directory if no match.
-            if ( empty( $matched_types ) ) {
-                bp_core_redirect( bp_get_groups_directory_permalink() );
-            }
-
-            // Set our global variable.
-            buddypress()->groups->current_directory_type = reset( $matched_types );
-        }
-
         bp_update_is_directory( true, 'groups' );
 

trunk/src/bp-groups/classes/class-bp-groups-component.php

@@ -266 +266 @@
         } else {
             $this->current_group = 0;
+        }
+
+        // Set group type if available.
+        if ( bp_is_groups_directory() && bp_is_current_action( bp_get_groups_group_type_base() ) && bp_action_variable() ) {
+            $matched_types = bp_groups_get_group_types( array(
+                'has_directory'  => true,
+                'directory_slug' => bp_action_variable(),
+            ) );
+
+            // Set 404 if we do not have a valid group type.
+            if ( empty( $matched_types ) ) {
+                bp_do_404();
+                return;
+            }
+
+            // Set our directory type marker.
+            $this->current_directory_type = reset( $matched_types );
         }
 
@@ -298 +315 @@
 
         // If the user was attempting to access a group, but no group by that name was found, 404.
-        if ( bp_is_groups_component() && empty( $this->current_group ) && bp_current_action() && !in_array( bp_current_action(), $this->forbidden_names ) ) {
+        if ( bp_is_groups_component() && empty( $this->current_group ) && empty( $this->current_directory_type ) && bp_current_action() && ! in_array( bp_current_action(), $this->forbidden_names ) ) {
             bp_do_404();
             return;

trunk/tests/phpunit/testcases/routing/groups.php

@@ -28 +28 @@
         $this->assertTrue( bp_is_user_groups() && bp_is_current_action( 'invites' ) );
     }
+
+    /**
+     * @group group_types
+     */
+    public function test_group_directory_with_type() {
+        bp_groups_register_group_type( 'foo' );
+        $this->go_to( bp_get_groups_directory_permalink() . 'type/foo/' );
+        $this->assertTrue( bp_is_groups_component() && ! bp_is_group() && bp_is_current_action( bp_get_groups_group_type_base() ) && bp_is_action_variable( 'foo', 0 ) );
+    }
+
+    /**
+     * @group group_types
+     */
+    public function test_group_directory_with_type_that_has_custom_directory_slug() {
+        bp_groups_register_group_type( 'foo', array( 'has_directory' => 'foos' ) );
+        $this->go_to( bp_get_groups_directory_permalink() . 'type/foos/' );
+        $this->assertTrue( bp_is_groups_component() && ! bp_is_group() && bp_is_current_action( bp_get_groups_group_type_base() ) && bp_is_action_variable( 'foos', 0 ) );
+    }
+
+    /**
+     * @group group_types
+     */
+    public function test_group_directory_should_404_for_group_types_that_have_no_directory() {
+        bp_register_member_type( 'foo', array( 'has_directory' => false ) );
+        $this->go_to( bp_get_members_directory_permalink() . 'type/foo/' );
+        $this->assertTrue( is_404() );
+    }
+
+    /**
+     * @group group_types
+     */
+    public function test_group_directory_should_404_for_invalid_group_types() {
+        $this->go_to( bp_get_members_directory_permalink() . 'type/foo/' );
+        $this->assertTrue( is_404() );
+    }
 }