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

Timestamp:

10/17/2013 07:00:46 PM (11 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-template.php (modified) (2 diffs)

trunk/bp-groups/bp-groups-template.php

@@ -1781 +1781 @@
                 case 'private' :
 
-                    // Member has not requested membership yet
-                    if ( !bp_group_has_requested_membership( $group ) ) {
+                    // Member has outstanding invitation -
+                    // show an "Accept Invitation" button
+                    if ( $group->is_invited ) {
+                        $button = array(
+                            'id'                => 'accept_invite',
+                            'component'         => 'groups',
+                            'must_be_logged_in' => true,
+                            'block_self'        => false,
+                            'wrapper_class'     => 'group-button ' . $group->status,
+                            'wrapper_id'        => 'groupbutton-' . $group->id,
+                            'link_href'         => add_query_arg( 'redirect_to', bp_get_group_permalink( $group ), bp_get_group_accept_invite_link( $group ) ),
+                            'link_text'         => __( 'Accept Invitation', 'buddypress' ),
+                            'link_title'        => __( 'Accept Invitation', 'buddypress' ),
+                            'link_class'        => 'group-button accept-invite',
+                        );
+
+                    // Member has requested membership but request is pending -
+                    // show a "Request Sent" button
+                    } elseif ( $group->is_pending ) {
+                        $button = array(
+                            'id'                => 'membership_requested',
+                            'component'         => 'groups',
+                            'must_be_logged_in' => true,
+                            'block_self'        => false,
+                            'wrapper_class'     => 'group-button pending ' . $group->status,
+                            'wrapper_id'        => 'groupbutton-' . $group->id,
+                            'link_href'         => bp_get_group_permalink( $group ),
+                            'link_text'         => __( 'Request Sent', 'buddypress' ),
+                            'link_title'        => __( 'Request Sent', 'buddypress' ),
+                            'link_class'        => 'group-button pending membership-requested',
+                        );
+
+                    // Member has not requested membership yet -
+                    // show a "Request Membership" button
+                    } else {
                         $button = array(
                             'id'                => 'request_membership',
@@ -1794 +1827 @@
                             'link_title'        => __( 'Request Membership', 'buddypress' ),
                             'link_class'        => 'group-button request-membership',
-                        );
-
-                    // Member has requested membership already
-                    } else {
-                        $button = array(
-                            'id'                => 'membership_requested',
-                            'component'         => 'groups',
-                            'must_be_logged_in' => true,
-                            'block_self'        => false,
-                            'wrapper_class'     => 'group-button pending ' . $group->status,
-                            'wrapper_id'        => 'groupbutton-' . $group->id,
-                            'link_href'         => bp_get_group_permalink( $group ),
-                            'link_text'         => __( 'Request Sent', 'buddypress' ),
-                            'link_title'        => __( 'Request Sent', 'buddypress' ),
-                            'link_class'        => 'group-button pending membership-requested',
                         );
                     }