diff --git a/admin/ajax/togglegroups.php b/admin/ajax/togglegroups.php index 86834f56ea3adea6fa04af06c66eac90d03693d1..f821ae0bfaa61e0008850585ccef5a65b515c1a6 100644 --- a/admin/ajax/togglegroups.php +++ b/admin/ajax/togglegroups.php @@ -31,7 +31,7 @@ else{ // Return Success story if( $success ){ - echo json_encode( array( "status" => "success", "data" => array( "username" => $username, "action" => $action, "groupname" => $groupname ))); + echo json_encode( array( "status" => "success", "data" => array( "username" => $username, "action" => $action, "groupname" => $group ))); } else{ echo json_encode( array( "status" => "error", "data" => array( "message" => "Unable to $error group $group" ))); diff --git a/admin/js/users.js b/admin/js/users.js index a649d641c8035b69337df3bcb7749f3f6112bb18..4c3245fef9bd66939232a0d60df3705f959e4221 100644 --- a/admin/js/users.js +++ b/admin/js/users.js @@ -78,9 +78,9 @@ $(document).ready(function(){ $("input[x-use='creategroupfield']").val( "" ); // Add group option to Create User and Edit User - var createuser = '<input x-gid="'+groupname+'" type="checkbox" name="groups[]" value="'+groupname+'" /><span x-gid="'+groupname+'">'+groupname+'<br /></span>'; + var createuser = '<input x-use="createusercheckbox" x-gid="'+groupname+'" type="checkbox" name="groups[]" value="'+groupname+'" /> <span x-gid="'+groupname+'">'+groupname+'<br /></span>'; $("#createusergroups").append( createuser ); - var changeuser = '<input x-use="togglegroup" x-gid="'+groupname+'" type="checkbox" name="groups[]" value="'+groupname+'" /><span x-use="togglegroup" x-gid="'+groupname+'">'+groupname+'<br /></span>'; + var changeuser = '<input x-use="togglegroup" x-gid="'+groupname+'" type="checkbox" name="groups[]" value="'+groupname+'" /> <span x-use="togglegroup" x-gid="'+groupname+'">'+groupname+'<br /></span>'; $("#changegroupsform").append( changeuser ); } @@ -91,7 +91,7 @@ $(document).ready(function(){ $( "input[x-gid='"+groupname+"']" ).remove(); // remove it from user list - $( "td[x-use='usergroups']" ).each(function(index){ + $( "div[x-use='usergroupsdiv']" ).each(function(index){ var content = $(this).text(); var list = content.split( ", " ); var newlist = []; diff --git a/lib/Group/database.php b/lib/Group/database.php index b0935edb05c915f6ba351f47895e3b28d03cd8da..6e508a4d47c2964370c3b1b3a3eb1a55e86fe3a7 100644 --- a/lib/Group/database.php +++ b/lib/Group/database.php @@ -134,6 +134,8 @@ class OC_GROUP_DATABASE extends OC_GROUP_BACKEND { public static function removeFromGroup( $uid, $gid ){ $query = OC_DB::prepare( "DELETE FROM `*PREFIX*group_user` WHERE `uid` = ? AND `gid` = ?" ); $result = $query->execute( array( $uid, $gid )); + + return true; } /**