diff --git a/config/alfresco/templates/webscripts/org/alfresco/repository/groups/children.delete.desc.xml b/config/alfresco/templates/webscripts/org/alfresco/repository/groups/children.delete.desc.xml
index 12c95c5742..e0f69fb649 100644
--- a/config/alfresco/templates/webscripts/org/alfresco/repository/groups/children.delete.desc.xml
+++ b/config/alfresco/templates/webscripts/org/alfresco/repository/groups/children.delete.desc.xml
@@ -4,7 +4,7 @@
Remove an authority (USER or GROUP) from a group. A user will not be deleted by this method.
You must have "administrator" privileges to alter a group.
-
+
]]>
/api/groups/{shortGroupName}/children/{fullAuthorityName}
diff --git a/config/alfresco/templates/webscripts/org/alfresco/repository/groups/children.delete.js b/config/alfresco/templates/webscripts/org/alfresco/repository/groups/children.delete.js
index 6dbe2a20d6..9ab85c10cb 100644
--- a/config/alfresco/templates/webscripts/org/alfresco/repository/groups/children.delete.js
+++ b/config/alfresco/templates/webscripts/org/alfresco/repository/groups/children.delete.js
@@ -1,22 +1,22 @@
/**
- * remove authority from group
+ * Remove authority from group
*/
function main ()
{
- var urlElements = url.extension.split("/");
- var shortName = urlElements[0];
- var fullAuthorityName = urlElements[2];
-
- var group = groups.getGroup(shortName);
- if (group == null)
- {
- // Group cannot be found
- status.setCode(status.STATUS_NOT_FOUND, "The group :" + shortName + ", does not exist.");
- return;
- }
-
- group.removeAuthority(fullAuthorityName);
+ var urlElements = url.extension.split("/");
+ var shortName = urlElements[0];
+ var fullAuthorityName = urlElements[2];
+
+ var group = groups.getGroup(shortName);
+ if (group == null)
+ {
+ // Group cannot be found
+ status.setCode(status.STATUS_NOT_FOUND, "The group :" + shortName + ", does not exist.");
+ return;
+ }
+
+ group.removeAuthority(fullAuthorityName);
}
-main();
+main();
\ No newline at end of file
diff --git a/config/alfresco/templates/webscripts/org/alfresco/repository/groups/children.get.js b/config/alfresco/templates/webscripts/org/alfresco/repository/groups/children.get.js
index 8654745dda..0a13f60303 100644
--- a/config/alfresco/templates/webscripts/org/alfresco/repository/groups/children.get.js
+++ b/config/alfresco/templates/webscripts/org/alfresco/repository/groups/children.get.js
@@ -1,42 +1,44 @@
-// get children
-function main ()
-{
+/**
+ * Get children
+ */
- var urlElements = url.extension.split("/");
- var shortName = urlElements[0];
-
- var authorityType = args["authorityType"];
-
- var group = groups.getGroup(shortName);
- if (group == null)
- {
- // Group cannot be found
- status.setCode(status.STATUS_NOT_FOUND, "The group :" + shortName + ", does not exist.");
- return;
- }
-
- model.group = group;
-
- if(authorityType != null)
- {
- if(!authorityType.match("[GROUP|USER]"))
- {
- status.setCode(status.STATUS_BAD_REQUEST, "The authorityType argument has does not have a correct value.");
- return;
- }
- if(authorityType == "GROUP")
- {
- model.children = group.getChildGroups();
- }
- if(authorityType == "USER")
- {
- model.children = group.getChildUsers();
- }
- }
- else
- {
- model.children = group.getChildAuthorities();
- }
+function main()
+{
+ var urlElements = url.extension.split("/");
+ var shortName = urlElements[0];
+
+ var authorityType = args["authorityType"];
+
+ var group = groups.getGroup(shortName);
+ if (group == null)
+ {
+ // Group cannot be found
+ status.setCode(status.STATUS_NOT_FOUND, "The group :" + shortName + ", does not exist.");
+ return;
+ }
+
+ model.group = group;
+
+ if (authorityType != null)
+ {
+ if (!authorityType.match("[GROUP|USER]"))
+ {
+ status.setCode(status.STATUS_BAD_REQUEST, "The authorityType argument has does not have a correct value.");
+ return;
+ }
+ if (authorityType == "GROUP")
+ {
+ model.children = group.getChildGroups();
+ }
+ if (authorityType == "USER")
+ {
+ model.children = group.getChildUsers();
+ }
+ }
+ else
+ {
+ model.children = group.getChildAuthorities();
+ }
}
main();
\ No newline at end of file
diff --git a/config/alfresco/templates/webscripts/org/alfresco/repository/groups/children.post.js b/config/alfresco/templates/webscripts/org/alfresco/repository/groups/children.post.js
index 02988e4671..1d82328fd1 100644
--- a/config/alfresco/templates/webscripts/org/alfresco/repository/groups/children.post.js
+++ b/config/alfresco/templates/webscripts/org/alfresco/repository/groups/children.post.js
@@ -1,46 +1,45 @@
/**
- * Link groups or users to group.
- *
- * Will create sub-groups if they don't already exist.
- */
+ * Link groups or users to group.
+ *
+ * Will create sub-groups if they don't already exist.
+ */
-function main ()
+function main()
{
- var urlElements = url.extension.split("/");
- var shortName = urlElements[0];
- var fullAuthorityName = urlElements[2];
-
- var group = groups.getGroup(shortName);
- var GROUP_PREFIX = "GROUP_";
-
- if (group == null)
- {
- // Parent Group cannot be found
- status.setCode(status.STATUS_NOT_FOUND, "The group :" + shortName + ", does not exist.");
- return;
- }
-
- if (fullAuthorityName.match("^" + GROUP_PREFIX + "*"))
- {
- var subGroupName = fullAuthorityName.substr(GROUP_PREFIX.length);
- var child = groups.getGroup(subGroupName);
-
- // This is a group authority
- if(child == null)
- {
- // child does not exist
- child = group.createGroup(subGroupName, subGroupName);
- status.code = status.STATUS_CREATED;
- model.group = child;
- return;
- }
- }
-
- // Link an existing group or user
- group.addAuthority(fullAuthorityName);
- status.code = status.STATUS_OK;
- model.group
+ var urlElements = url.extension.split("/");
+ var shortName = urlElements[0];
+ var fullAuthorityName = urlElements[2];
+
+ var group = groups.getGroup(shortName);
+ var GROUP_PREFIX = "GROUP_";
+ if (group == null)
+ {
+ // Parent Group cannot be found
+ status.setCode(status.STATUS_NOT_FOUND, "The group :" + shortName + ", does not exist.");
+ return;
+ }
+
+ if (fullAuthorityName.match("^" + GROUP_PREFIX + "*"))
+ {
+ var subGroupName = fullAuthorityName.substr(GROUP_PREFIX.length);
+ var child = groups.getGroup(subGroupName);
+
+ // This is a group authority
+ if(child == null)
+ {
+ // child does not exist
+ child = group.createGroup(subGroupName, subGroupName);
+ status.code = status.STATUS_CREATED;
+ model.group = child;
+ return;
+ }
+ }
+
+ // Link an existing group or user
+ group.addAuthority(fullAuthorityName);
+ status.code = status.STATUS_OK;
+ model.group
}
main();
\ No newline at end of file
diff --git a/config/alfresco/templates/webscripts/org/alfresco/repository/groups/group.get.js b/config/alfresco/templates/webscripts/org/alfresco/repository/groups/group.get.js
index 54325f8102..39c19f5712 100644
--- a/config/alfresco/templates/webscripts/org/alfresco/repository/groups/group.get.js
+++ b/config/alfresco/templates/webscripts/org/alfresco/repository/groups/group.get.js
@@ -2,20 +2,20 @@
* Get group
*/
-function main ()
+function main()
{
- var urlElements = url.extension.split("/");
- var shortName = urlElements[0];
-
- var group = groups.getGroup(shortName);
- if (group == null)
- {
- // Group cannot be found
- status.setCode(status.STATUS_NOT_FOUND, "The group :" + shortName + ", does not exist.");
- return;
- }
-
- model.group = group;
+ var urlElements = url.extension.split("/");
+ var shortName = urlElements[0];
+
+ var group = groups.getGroup(shortName);
+ if (group == null)
+ {
+ // Group cannot be found
+ status.setCode(status.STATUS_NOT_FOUND, "The group :" + shortName + ", does not exist.");
+ return;
+ }
+
+ model.group = group;
}
main();
\ No newline at end of file
diff --git a/config/alfresco/templates/webscripts/org/alfresco/repository/groups/group.put.json.js b/config/alfresco/templates/webscripts/org/alfresco/repository/groups/group.put.json.js
index 64ad2f3866..ade540c298 100644
--- a/config/alfresco/templates/webscripts/org/alfresco/repository/groups/group.put.json.js
+++ b/config/alfresco/templates/webscripts/org/alfresco/repository/groups/group.put.json.js
@@ -1,26 +1,26 @@
-// update group
+/**
+ * Update group
+ */
-function main ()
+function main()
{
- var urlElements = url.extension.split("/");
- var shortName = urlElements[0];
-
- var group = groups.getGroup(shortName);
- if (group == null)
- {
- // Group cannot be found
- status.setCode(status.STATUS_NOT_FOUND, "The group :" + shortName + ", does not exist.");
- return;
- }
-
- if (json.has("displayName") == true)
- {
- group.setDisplayName(json.get("displayName"));
- }
-
- model.group = group;
+ var urlElements = url.extension.split("/");
+ var shortName = urlElements[0];
+
+ var group = groups.getGroup(shortName);
+ if (group == null)
+ {
+ // Group cannot be found
+ status.setCode(status.STATUS_NOT_FOUND, "The group :" + shortName + ", does not exist.");
+ return;
+ }
+
+ if (json.has("displayName") == true)
+ {
+ group.setDisplayName(json.get("displayName"));
+ }
+
+ model.group = group;
}
-main();
-
-
+main();
\ No newline at end of file
diff --git a/config/alfresco/templates/webscripts/org/alfresco/repository/groups/groups.delete.desc.xml b/config/alfresco/templates/webscripts/org/alfresco/repository/groups/groups.delete.desc.xml
index 222dab22d5..7e5d7201bd 100644
--- a/config/alfresco/templates/webscripts/org/alfresco/repository/groups/groups.delete.desc.xml
+++ b/config/alfresco/templates/webscripts/org/alfresco/repository/groups/groups.delete.desc.xml
@@ -4,7 +4,7 @@
Delete a group and all its dependents.
You must have "administrator" privileges to delete a group.
-
+
]]>
/api/groups/{shortName}
diff --git a/config/alfresco/templates/webscripts/org/alfresco/repository/groups/groups.delete.js b/config/alfresco/templates/webscripts/org/alfresco/repository/groups/groups.delete.js
index 8d49b14bcd..cb6effd4dd 100644
--- a/config/alfresco/templates/webscripts/org/alfresco/repository/groups/groups.delete.js
+++ b/config/alfresco/templates/webscripts/org/alfresco/repository/groups/groups.delete.js
@@ -1,21 +1,21 @@
-// delete group
+/**
+ * Delete group
+ */
-function main ()
+function main()
{
- var urlElements = url.extension.split("/");
- var shortName = urlElements[0];
-
- var group = groups.getGroup(shortName);
- if (group == null)
- {
- // Group cannot be found
- status.setCode(status.STATUS_NOT_FOUND, "The group :" + shortName + ", does not exist.");
- return;
- }
-
-
- group.deleteGroup();
-
+ var urlElements = url.extension.split("/");
+ var shortName = urlElements[0];
+
+ var group = groups.getGroup(shortName);
+ if (group == null)
+ {
+ // Group cannot be found
+ status.setCode(status.STATUS_NOT_FOUND, "The group :" + shortName + ", does not exist.");
+ return;
+ }
+
+ group.deleteGroup();
}
-main();
+main();
\ No newline at end of file
diff --git a/config/alfresco/templates/webscripts/org/alfresco/repository/groups/groups.get.js b/config/alfresco/templates/webscripts/org/alfresco/repository/groups/groups.get.js
index b181d194dc..50d8fa965a 100644
--- a/config/alfresco/templates/webscripts/org/alfresco/repository/groups/groups.get.js
+++ b/config/alfresco/templates/webscripts/org/alfresco/repository/groups/groups.get.js
@@ -1,6 +1,6 @@
/**
* List/Search groups
- */
+ */
function main ()
{
diff --git a/config/alfresco/templates/webscripts/org/alfresco/repository/groups/parent.get.js b/config/alfresco/templates/webscripts/org/alfresco/repository/groups/parent.get.js
index 2594cb492b..6a67f9eb81 100644
--- a/config/alfresco/templates/webscripts/org/alfresco/repository/groups/parent.get.js
+++ b/config/alfresco/templates/webscripts/org/alfresco/repository/groups/parent.get.js
@@ -1,34 +1,37 @@
-// get parents
+/**
+ * Get parent groups
+ */
+
function main ()
{
- var urlElements = url.extension.split("/");
- var shortName = urlElements[0];
-
- var level = args["level"];
-
- var group = groups.getGroup(shortName);
+ var urlElements = url.extension.split("/");
+ var shortName = urlElements[0];
+
+ var level = args["level"];
+
+ var group = groups.getGroup(shortName);
if (group == null)
{
// Group cannot be found
status.setCode(status.STATUS_NOT_FOUND, "The group: " + shortName + " does not exist.");
return;
}
-
- model.group = group;
-
- if (level != null)
- {
- if (!level.match("[ALL]"))
- {
- status.setCode(status.STATUS_BAD_REQUEST, "The level argument has does not have a correct value.");
- return;
- }
- model.parents = group.getAllParentGroups();
- }
- else
- {
- model.parents = group.getParentGroups();
- }
+
+ model.group = group;
+
+ if (level != null)
+ {
+ if (!level.match("[ALL]"))
+ {
+ status.setCode(status.STATUS_BAD_REQUEST, "The level argument has does not have a correct value.");
+ return;
+ }
+ model.parents = group.getAllParentGroups();
+ }
+ else
+ {
+ model.parents = group.getParentGroups();
+ }
}
main();
\ No newline at end of file
diff --git a/config/alfresco/templates/webscripts/org/alfresco/repository/groups/rootgroups.delete.desc.xml b/config/alfresco/templates/webscripts/org/alfresco/repository/groups/rootgroups.delete.desc.xml
index 6f50936c20..d621c7e7b8 100644
--- a/config/alfresco/templates/webscripts/org/alfresco/repository/groups/rootgroups.delete.desc.xml
+++ b/config/alfresco/templates/webscripts/org/alfresco/repository/groups/rootgroups.delete.desc.xml
@@ -4,7 +4,7 @@
Delete a root group and all its dependents.
You must have "administrator" privileges to delete a group.
-
+
]]>
/api/rootgroups/{shortName}
diff --git a/config/alfresco/templates/webscripts/org/alfresco/repository/groups/rootgroups.delete.js b/config/alfresco/templates/webscripts/org/alfresco/repository/groups/rootgroups.delete.js
index 8d49b14bcd..dc763204fc 100644
--- a/config/alfresco/templates/webscripts/org/alfresco/repository/groups/rootgroups.delete.js
+++ b/config/alfresco/templates/webscripts/org/alfresco/repository/groups/rootgroups.delete.js
@@ -1,21 +1,21 @@
-// delete group
+/**
+ * Delete group
+ */
-function main ()
+function main()
{
- var urlElements = url.extension.split("/");
- var shortName = urlElements[0];
-
- var group = groups.getGroup(shortName);
- if (group == null)
- {
- // Group cannot be found
- status.setCode(status.STATUS_NOT_FOUND, "The group :" + shortName + ", does not exist.");
- return;
- }
-
-
- group.deleteGroup();
-
+ var urlElements = url.extension.split("/");
+ var shortName = urlElements[0];
+
+ var group = groups.getGroup(shortName);
+ if (group == null)
+ {
+ // Group cannot be found
+ status.setCode(status.STATUS_NOT_FOUND, "The group :" + shortName + ", does not exist.");
+ return;
+ }
+
+ group.deleteGroup();
}
-main();
+main();
\ No newline at end of file
diff --git a/config/alfresco/templates/webscripts/org/alfresco/repository/groups/rootgroups.get.js b/config/alfresco/templates/webscripts/org/alfresco/repository/groups/rootgroups.get.js
index edbead269e..6fe1aa03e9 100644
--- a/config/alfresco/templates/webscripts/org/alfresco/repository/groups/rootgroups.get.js
+++ b/config/alfresco/templates/webscripts/org/alfresco/repository/groups/rootgroups.get.js
@@ -4,22 +4,19 @@
function main ()
{
- // Get the args
- var shortNameFilter = args["shortNameFilter"];
- var includeInternalStr = args["includeInternal"];
-
- if(shortNameFilter == null)
- {
- shortNameFilter = "";
- }
-
- var includeInternal = includeInternalStr == "true" ? true : false;
-
- // Do the search
- model.groups = groups.searchRootGroups(shortNameFilter, includeInternal);
+ // Get the args
+ var shortNameFilter = args["shortNameFilter"];
+ var includeInternalStr = args["includeInternal"];
+
+ if (shortNameFilter == null)
+ {
+ shortNameFilter = "";
+ }
+
+ var includeInternal = includeInternalStr == "true" ? true : false;
+
+ // Do the search
+ model.groups = groups.searchRootGroups(shortNameFilter, includeInternal);
}
-main();
-
-
-
+main();
\ No newline at end of file
diff --git a/config/alfresco/templates/webscripts/org/alfresco/repository/groups/rootgroups.post.json.js b/config/alfresco/templates/webscripts/org/alfresco/repository/groups/rootgroups.post.json.js
index e0f1352368..38422aa8b4 100644
--- a/config/alfresco/templates/webscripts/org/alfresco/repository/groups/rootgroups.post.json.js
+++ b/config/alfresco/templates/webscripts/org/alfresco/repository/groups/rootgroups.post.json.js
@@ -1,27 +1,29 @@
-// Create new rootgroup.
+/**
+ * Create new root group.
+ */
-function main ()
+function main()
{
- var urlElements = url.extension.split("/");
- var shortName = urlElements[0];
-
- var group = groups.getGroup(shortName);
- if (group != null)
- {
- // Group already exists
- status.setCode(status.STATUS_BAD_REQUEST, "The root group :" + shortName + ", already exixts.");
- return;
- }
-
- var displayName = shortName;
-
- if (json.has("displayName") == true)
- {
- displayName = json.get("displayName");
- }
-
- model.group = groups.createRootGroup(shortName, displayName);
- status.code = status.STATUS_CREATED;
+ var urlElements = url.extension.split("/");
+ var shortName = urlElements[0];
+
+ var group = groups.getGroup(shortName);
+ if (group != null)
+ {
+ // Group already exists
+ status.setCode(status.STATUS_BAD_REQUEST, "The root group :" + shortName + ", already exixts.");
+ return;
+ }
+
+ var displayName = shortName;
+
+ if (json.has("displayName") == true)
+ {
+ displayName = json.get("displayName");
+ }
+
+ model.group = groups.createRootGroup(shortName, displayName);
+ status.code = status.STATUS_CREATED;
}
main();
\ No newline at end of file