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

Timestamp:

10/17/2013 07:00:46 PM (13 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-classes.php (modified) (3 diffs)

trunk/bp-groups/bp-groups-classes.php

@@ -32 +32 @@
          */
         public $is_member;
+
+        /**
+         * Does the current user have an outstanding invitation to this group?
+         *
+         * @since BuddyPress (1.9.0)
+         * @var bool
+         */
+        public $is_invited;
+
+        /**
+         * Does the current user have a pending membership request to this group?
+         *
+         * @since BuddyPress (1.9.0)
+         * @var bool
+         */
+        public $is_pending;
 
         /**
@@ -73 +89 @@
                         $this->total_member_count = groups_get_groupmeta( $this->id, 'total_member_count' );
                         $this->is_member          = BP_Groups_Member::check_is_member( bp_loggedin_user_id(), $this->id );
+                        $this->is_invited         = BP_Groups_Member::check_has_invite( bp_loggedin_user_id(), $this->id );
+                        $this->is_pending         = BP_Groups_Member::check_for_membership_request( bp_loggedin_user_id(), $this->id );
 
                         // If this is a private or hidden group, does the current user have access?
@@ -828 +846 @@
                 $group_ids = implode( ',', wp_parse_id_list( $group_ids ) );
 
-                // Fetch the logged in users status within each group
-                $user_status = $wpdb->get_col( $wpdb->prepare( "SELECT group_id FROM {$bp->groups->table_name_members} WHERE user_id = %d AND group_id IN ( {$group_ids} ) AND is_confirmed = 1 AND is_banned = 0", bp_loggedin_user_id() ) );
+                // Fetch the logged-in user's status within each group
+                $user_status = $wpdb->get_results( $wpdb->prepare( "SELECT group_id, is_confirmed, invite_sent FROM {$bp->groups->table_name_members} WHERE user_id = %d AND group_id IN ( {$group_ids} ) AND is_banned = 0", bp_loggedin_user_id() ) );
+
                 for ( $i = 0, $count = count( $paged_groups ); $i < $count; ++$i ) {
                         $paged_groups[$i]->is_member = false;
 
-                        foreach ( (array) $user_status as $group_id ) {
-                                if ( $group_id == $paged_groups[$i]->id ) {
-                                        $paged_groups[$i]->is_member = true;
+                        foreach ( (array) $user_status as $group ) {
+                                $is_member = $is_invited = $is_pending = false;
+                                if ( $group->group_id == $paged_groups[ $i ]->id ) {
+                                        // is_confirmed means the user is a member
+                                        if ( $group->is_confirmed ) {
+                                                $is_member = true;
+
+                                        // invite_sent means the user has been invited
+                                        } else if ( $group->invite_sent ) {
+                                                $is_invited = true;
+
+                                        // User has sent request, but has not been confirmed
+                                        } else {
+                                                $is_pending = true;
+                                        }
                                 }
+
+                                $paged_groups[ $i ]->is_member = $is_member;
+                                $paged_groups[ $i ]->is_invited = $is_invited;
+                                $paged_groups[ $i ]->is_pending = $is_pending;
                         }
                 }