From 0730bb9296598a8792d057a136672c9d4c5bf697 Mon Sep 17 00:00:00 2001
From: Kevin Roast <kevin.roast@alfresco.com>
Date: Fri, 1 May 2009 12:34:57 +0000
Subject: [PATCH] Integrated Group Finder component into Create User panel in
 Users Admin Console tool. First pass at Edit User panel (unfinished). Person
 POST REST API now supports adding Groups to a new user. Fix Person GET REST
 API to correctly return empty quota. Added wildcard prefix option to Group
 Finder component. Fix up Group Finder so less likely to conflict with parent
 components CSS when included on a page. Added some missing styles to
 base/presentation CSS.

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@14161 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
---
 .../repository/person/people.post.json.js         | 15 +++++++++++++++
 .../org/alfresco/repository/person/person.lib.ftl |  2 +-
 2 files changed, 16 insertions(+), 1 deletion(-)

diff --git a/config/alfresco/templates/webscripts/org/alfresco/repository/person/people.post.json.js b/config/alfresco/templates/webscripts/org/alfresco/repository/person/people.post.json.js
index 08b1c33f83..5e2307f707 100644
--- a/config/alfresco/templates/webscripts/org/alfresco/repository/person/people.post.json.js
+++ b/config/alfresco/templates/webscripts/org/alfresco/repository/person/people.post.json.js
@@ -59,6 +59,21 @@ function main()
    var quota = (json.has("quota") ? json.get("quota") : -1);
    people.setQuota(person, quota.toString());
    
+   // apply groups if supplied - note that only Admin can successfully do this
+   if (json.has("groups"))
+   {
+      var groups = json.get("groups");
+      for (var index=0; index<groups.length(); index++)
+      {
+         var groupId = groups.getString(index);
+         var group = people.getGroup(groupId);
+         if (group != null)
+         {
+            people.addAuthority(group, person);
+         }
+      }
+   }
+   
    // Put the created person into the model
    model.person = person;
 }
diff --git a/config/alfresco/templates/webscripts/org/alfresco/repository/person/person.lib.ftl b/config/alfresco/templates/webscripts/org/alfresco/repository/person/person.lib.ftl
index f35a404c7e..287319f346 100644
--- a/config/alfresco/templates/webscripts/org/alfresco/repository/person/person.lib.ftl
+++ b/config/alfresco/templates/webscripts/org/alfresco/repository/person/person.lib.ftl
@@ -23,7 +23,7 @@
 	"companyemail" : <#if person.properties.companyemail??>"${person.properties.companyemail}"<#else>null</#if>,
 	"skype" : <#if person.properties.skype??>"${person.properties.skype}"<#else>null</#if>,
 	"instantmsg" : <#if person.properties.instantmsg??>"${person.properties.instantmsg}"<#else>null</#if>,
-	"quota" : <#if person.properties.sizeQuota??>${person.properties.sizeQuota?c}<#else>0</#if>,
+	"quota" : <#if person.properties.sizeQuota??>${person.properties.sizeQuota?c}<#else>-1</#if>,
 	"sizeCurrent" : <#if person.properties.sizeCurrent??>${person.properties.sizeCurrent?c}<#else>0</#if>,
 	"persondescription" : <#if person.properties.persondescription??>"${person.properties.persondescription.content}"<#else>null</#if>
 </#escape>