Changeset 7442 for trunk/bp-groups/bp-groups-loader.php

Timestamp:

10/17/2013 07:00:46 PM (12 years ago)

Author:

boonebgorges

Message:

Improve UX flow around overlapping group invites and requests

This changeset introduces a number of improvements to the flow surrounding
invitations and membership requests to private groups:

• When a user has previously requested membership in a group, add a note to that effect when the user is being invited to the group via the Send Invites interface.
• When a user has previously requested membership in a group, automatically accept that invitation and add the user to the group when an invitation is sent by an existing group member.
• When a user has previously been invited to a group, buttons in the group directory and in the group header should read Accept Invitation instead of Request Membership

The end result is a more logical user experience with regard to joining private
groups.

Fixes #5032

Props Mike_Cowobo

File:

• trunk/bp-groups/bp-groups-loader.php (modified) (1 diff)

trunk/bp-groups/bp-groups-loader.php

@@ -413 +413 @@
             );
 
-            // If this is a private group, and the user is not a member, show a "Request Membership" nav item.
+            // If this is a private group, and the user is not a
+            // member and does not have an outstanding invitation,
+            // show a "Request Membership" nav item.
             if ( is_user_logged_in() &&
-                 !bp_current_user_can( 'bp_moderate' ) &&
-                 !$this->current_group->is_user_member &&
-                 !groups_check_for_membership_request( bp_loggedin_user_id(), $this->current_group->id ) &&
-                 $this->current_group->status == 'private'
+                 ! bp_current_user_can( 'bp_moderate' ) &&
+                 ! $this->current_group->is_user_member &&
+                 ! groups_check_for_membership_request( bp_loggedin_user_id(), $this->current_group->id ) &&
+                 $this->current_group->status == 'private' &&
+                 ! groups_check_user_has_invite( bp_loggedin_user_id(), $this->current_group->id )
                 ) {
+
                 $sub_nav[] = array(
                     'name'               => __( 'Request Membership', 'buddypress' ),