Changeset 8417

Timestamp:

05/12/2014 08:36:26 PM (11 years ago)

Author:

boonebgorges

Message:

Improve logic for adding a user to a group in the Dashboard

On submit, the JS converts the dynamically created <li> items to a proper
comma-separated list of user logins. This creates greater consistency with the
noscript workflow, and also fixes a bug where users who were found via
autocomplete but then removed from the list of users to add would be added
anyway.

Fixes #5633

Props imath

Location:

trunk/src/bp-groups

Files:

• admin/js/admin.js (modified) (3 diffs)
• bp-groups-admin.php (modified) (1 diff)

trunk/src/bp-groups/admin/js/admin.js

@@ -3 +3 @@
 (function($) {
     function add_member_to_list( e, ui ) {
-        var remove_id = 'bp-groups-remove-new-member-' + ui.item.value;
-        $('#bp-groups-new-members-list').append('<li><a href="#" class="bp-groups-remove-new-member" id="' + remove_id + '">x</a> ' + ui.item.label + '</li>');
-        $('#' + remove_id).bind('click', function(e) { remove_member_from_list(e); return false; });
-
-        $('#bp-groups-new-members-list').after('<input name="new_members[]" type="hidden" value="' + ui.item.value + '" />');
-    }
-
-    function remove_member_from_list( e ) {
-        $(e.target).closest('li').remove();
+        $('#bp-groups-new-members-list').append('<li data-login="' + ui.item.value + '"><a href="#" class="bp-groups-remove-new-member">x</a> ' + ui.item.label + '</li>');
     }
 
@@ -28 +20 @@
             select:    function( event, ui ) { add_member_to_list( event, ui ); }
         });
-        
+
         /* Replace noscript placeholder */
-        $( '#bp-groups-new-members' ).attr( 'placeholder', BP_Group_Admin.add_member_placeholder );
+        $( '#bp-groups-new-members' ).prop( 'placeholder', BP_Group_Admin.add_member_placeholder );
+
+        /* Remove a member on 'x' click */
+        $( '#bp_group_add_members' ).on( 'click', '.bp-groups-remove-new-member', function( e ) {
+            e.preventDefault();
+            $( e.target.parentNode ).remove();
+        } );
 
         /* Warn before leaving unsaved changes */
@@ -38 +36 @@
 
         $( 'input#save' ).on( 'click', function() {
+            /* Check for users to add */
+            var users_to_add = [];
+
+            $( '#bp-groups-new-members-list li' ).each( function() {
+                users_to_add.push( $(this).data('login' ) );
+            } );
+
+            /* There are users to add, include a comma separated list of users login in the main field */
+            if ( users_to_add.length ) {
+                $( '#bp-groups-new-members' ).val( '' ).val( users_to_add.join( ', ' ) );
+            }
+
             window.warn_on_leave = false;
         });

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

@@ -229 +229 @@
         if ( ! empty( $_POST['bp-groups-new-members'] ) ) {
             $user_names = array_merge( $user_names, explode( ',', $_POST['bp-groups-new-members'] ) );
-        }
-
-        if ( ! empty( $_POST['new_members'] ) ) {
-            $user_names = array_merge( $user_names, $_POST['new_members'] );
         }