From f1e78be4f42a24778ebbd56c6438d8b5f5f411b3 Mon Sep 17 00:00:00 2001
From: Jakob Sack <kde@jakobsack.de>
Date: Mon, 18 Apr 2011 13:12:30 +0200
Subject: [PATCH] Even more fixes on user management. Any designers here that
 want to make it good looking?

---
 admin/ajax/togglegroups.php | 2 +-
 admin/js/users.js           | 6 +++---
 lib/Group/database.php      | 2 ++
 3 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/admin/ajax/togglegroups.php b/admin/ajax/togglegroups.php
index 86834f56ea3..f821ae0bfaa 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 a649d641c80..4c3245fef9b 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 b0935edb05c..6e508a4d47c 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;
 	}
 
 	/**
-- 
2.39.5