mirror of
https://github.com/Alfresco/alfresco-community-repo.git
synced 2025-08-07 17:49:17 +00:00
Merge branch 'feature-2.4/RM-3132_Update_license_headers' into release/V2.4
Conflicts: rm-community/rm-community-share/config/alfresco/site-webscripts/org/alfresco/rm/customizations/components/rules/rules-header.get.js rm-enterprise/rm-enterprise-repo/src/main/amp/config/alfresco/module/alfresco-rm-enterprise-repo/context/webscript-context.xml rm-enterprise/rm-enterprise-repo/src/main/java/org/alfresco/module/org_alfresco_module_rm/classification/package-info.java rm-enterprise/rm-enterprise-repo/src/main/java/org/alfresco/module/org_alfresco_module_rm/referredmetadata/package-info.java rm-enterprise/rm-enterprise-share/src/main/amp/config/alfresco/site-webscripts/org/alfresco/rm-enterprise/components/rules/config/rule-config-action.get.js rm-enterprise/rm-enterprise-share/src/main/amp/config/alfresco/site-webscripts/org/alfresco/rm-enterprise/components/rules/config/rule-config-condition.get.js rm-enterprise/rm-enterprise-share/src/main/amp/config/alfresco/site-webscripts/org/alfresco/rm-enterprise/components/rules/rule-details.get.js rm-enterprise/rm-enterprise-share/src/main/amp/config/alfresco/site-webscripts/org/alfresco/rm-enterprise/components/rules/rule-edit.get.js
This commit is contained in:
@@ -48,7 +48,7 @@ function getTreenode()
|
|||||||
skipPermissionCheck = args["perms"] == "false",
|
skipPermissionCheck = args["perms"] == "false",
|
||||||
evalChildFolders = false,
|
evalChildFolders = false,
|
||||||
item, rmNode, capabilities, cap;
|
item, rmNode, capabilities, cap;
|
||||||
|
|
||||||
// Use helper function to get the arguments
|
// Use helper function to get the arguments
|
||||||
var parsedArgs = ParseArgs.getParsedArgs();
|
var parsedArgs = ParseArgs.getParsedArgs();
|
||||||
if (parsedArgs === null)
|
if (parsedArgs === null)
|
||||||
@@ -84,16 +84,16 @@ function getTreenode()
|
|||||||
{
|
{
|
||||||
//capabilities = {};
|
//capabilities = {};
|
||||||
rmNode = rmService.getRecordsManagementNode(item);
|
rmNode = rmService.getRecordsManagementNode(item);
|
||||||
|
|
||||||
//for each (cap in rmNode.capabilitiesSet("Create"))
|
//for each (cap in rmNode.capabilitiesSet("Create"))
|
||||||
//{
|
//{
|
||||||
// capabilities[cap.name] = true;
|
// capabilities[cap.name] = true;
|
||||||
//}
|
//}
|
||||||
|
|
||||||
//
|
//
|
||||||
|
|
||||||
hasCreateCapability = rmNode.hasCapability("Create");
|
hasCreateCapability = rmNode.hasCapability("Create");
|
||||||
|
|
||||||
if (evalChildFolders)
|
if (evalChildFolders)
|
||||||
{
|
{
|
||||||
hasSubfolders = item.childFileFolders(false, true, "fm:forum").length > 0;
|
hasSubfolders = item.childFileFolders(false, true, "fm:forum").length > 0;
|
||||||
@@ -111,9 +111,9 @@ function getTreenode()
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
items.sort(sortByName);
|
items.sort(sortByName);
|
||||||
|
|
||||||
return (
|
return (
|
||||||
{
|
{
|
||||||
parent: parsedArgs.pathNode,
|
parent: parsedArgs.pathNode,
|
||||||
@@ -143,20 +143,20 @@ function itemIsAllowed(item)
|
|||||||
{
|
{
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
var typeShort = String(item.typeShort);
|
var typeShort = String(item.typeShort);
|
||||||
|
|
||||||
// Don't show Hold and Transfer top-level containers
|
// Don't show Hold and Transfer top-level containers
|
||||||
if (typeShort == "rma:holdContainer" || typeShort == "rma:transferContainer" || typeShort == "rma:unfiledRecordContainer")
|
if (typeShort == "rma:holdContainer" || typeShort == "rma:transferContainer" || typeShort == "rma:unfiledRecordContainer")
|
||||||
{
|
{
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
// Must be a "dod:" or "rma:" namespaced type
|
// Must be a "dod:" or "rma:" namespaced type
|
||||||
if (typeShort.indexOf("dod:") !== 0 && typeShort.indexOf("rma") !== 0)
|
if (typeShort.indexOf("dod:") !== 0 && typeShort.indexOf("rma") !== 0)
|
||||||
{
|
{
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
Reference in New Issue
Block a user