inteligr8/alfresco-community-repo
1
0
Fork 0
mirror of https://github.com/Alfresco/alfresco-community-repo.git synced 2025-08-07 17:49:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

RM-2604 Rename caveat group types.

Browse Source 
Now we have HIERARCHICAL, USER_REQUIRES_ALL and USER_REQUIRES_ANY.

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/modules/recordsmanagement/DEV/caveatmarkdatatype@114265 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Tom Page
2015-10-13 13:43:36 +00:00
parent 56948b989c
commit 9e93ad5f10
4 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
rm-server/config/alfresco/module/org_alfresco_module_rm/caveat/rm-caveats.json
View File

@@ -24,7 +24,7 @@
"id" : "nationality", "id" : "nationality",
"displayLabel" : "rm.caveat.nationality.label", "displayLabel" : "rm.caveat.nationality.label",
"description" : "rm.caveat.nationality.description", "description" : "rm.caveat.nationality.description",
"type" : "CUMULATIVE_AVAILABILITY", "type" : "USER_REQUIRES_ANY",
"marks" : "marks" :
[ [
{ {
@@ -45,7 +45,7 @@
"id" : "training", "id" : "training",
"displayLabel" : "rm.caveat.training.label", "displayLabel" : "rm.caveat.training.label",
"description" : "rm.caveat.training.description", "description" : "rm.caveat.training.description",
"type" : "CUMULATIVE_SECURITY", "type" : "USER_REQUIRES_ALL",
"marks" : "marks" :
[ [
{ {

4
rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/caveat/scheme/CaveatGroupType.java
View File

@@ -30,7 +30,7 @@ public enum CaveatGroupType
/** Each mark in the group implies all earlier marks also apply. */ /** Each mark in the group implies all earlier marks also apply. */
HIERARCHICAL, HIERARCHICAL,
/** Many marks may be applied to content, and users need all marks to access it. */ /** Many marks may be applied to content, and users need all marks to access it. */
CUMULATIVE_SECURITY, USER_REQUIRES_ALL,
/** Many marks may be applied to content, and users can access it with any one mark. */ /** Many marks may be applied to content, and users can access it with any one mark. */
CUMULATIVE_AVAILABILITY USER_REQUIRES_ANY
} }

2
rm-server/unit-test/resources/alfresco/caveat/rm-caveats-duplicateMarkIdInDifferentGroups.json
View File

@@ -16,7 +16,7 @@
"id" : "nationality", "id" : "nationality",
"displayLabel" : "rm.caveat.nationality.group", "displayLabel" : "rm.caveat.nationality.group",
"description" : "rm.caveat.nationality.description", "description" : "rm.caveat.nationality.description",
"type" : "CUMULATIVE_AVAILABILITY", "type" : "USER_REQUIRES_ANY",
"marks" : "marks" :
[ [
{ {

2
rm-server/unit-test/resources/alfresco/caveat/rm-caveats-malformedJSON.json
View File

@@ -24,7 +24,7 @@
"id" : "nationality", "id" : "nationality",
"displayLabel" : "rm.caveat.nationality.group", "displayLabel" : "rm.caveat.nationality.group",
"description" : "rm.caveat.nationality.description", "description" : "rm.caveat.nationality.description",
"type" : "CUMULATIVE_AVAILABILITY", "type" : "USER_REQUIRES_ANY",
"marks" : "marks" :
[ [
{ {