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

DOD Recert: Allow permissions to be set on the file plan node (so that Dan and Jan can create root categories)

Browse Source 
* Merge HEAD to DEV/DODCERT

    - r43798 RM-552 (Add 'Manage Permission' action to file plan toolbar)
    - r43859 RM-552 (Add 'Manage Permission' action to file plan toolbar)
                * Changed the icons
    - r43863 RM-552 (Add 'Manage Permission' action to file plan toolbar)
                * Changed the existing ManageAccessRights capability and reusing it



git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/modules/recordsmanagement/DEV/DODRECERT@50933 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Roy Wetherall
2013-06-12 04:09:07 +00:00
parent 70ba19991c
commit cb6eb52bbf
4 changed files with 34 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
rm-server/config/alfresco/module/org_alfresco_module_rm/capability/rm-capabilities-group-context.xml
View File

@@ -141,6 +141,5 @@
<ref bean="rmFileRecordsCapability"/> <ref bean="rmFileRecordsCapability"/>
</list> </list>
</property> </property>
</bean> </bean>
</beans> </beans>

23
rm-server/config/alfresco/module/org_alfresco_module_rm/rm-capabilities-context.xml
View File

@@ -169,17 +169,18 @@
<property name="permission" value="ManageAccessControls" /> <property name="permission" value="ManageAccessControls" />
</bean> </bean>
<bean id="rmManageAccessRightsCapability" <bean id="rmManageAccessRightsCapability"
parent="declarativeCapability"> parent="declarativeCapability">
<property name="name" value="ManageAccessRights"/> <property name="name" value="ManageAccessRights"/>
<property name="permission" value="ManageAccessRights"/> <property name="permission" value="ManageAccessRights"/>
<property name="conditions"> <property name="conditions">
<map> <map>
<entry key="capabilityCondition.frozen" value="false"/> <entry key="capabilityCondition.frozen" value="false"/>
</map> <entry key="capabilityCondition.filling" value="true"/>
</property> </map>
</bean> </property>
</bean>
<bean id="rmMapClassificationGuideMetadataCapability" <bean id="rmMapClassificationGuideMetadataCapability"
parent="declarativeCapability"> parent="declarativeCapability">
<property name="name" value="MapClassificationGuideMetadata" /> <property name="name" value="MapClassificationGuideMetadata" />

30
rm-server/config/alfresco/module/org_alfresco_module_rm/rm-ui-evaluators-context.xml
View File

@@ -299,20 +299,20 @@
</property> </property>
<property name="capability" value="Delete"/> <property name="capability" value="Delete"/>
</bean> </bean>
<bean id="jsonConversionComponent.managePermissionsAction" <bean id="jsonConversionComponent.managePermissionsAction"
parent="jsonConversionComponent.baseAction"> parent="jsonConversionComponent.baseAction">
<property name="name" value="managePermissions"/> <property name="name" value="managePermissions"/>
<property name="kinds"> <property name="kinds">
<set> <set>
<value>RECORD_CATEGORY</value> <value>FILE_PLAN</value>
<value>RECORD_FOLDER</value> <value>RECORD_CATEGORY</value>
<value>RECORD</value> <value>RECORD_FOLDER</value>
</set> </set>
</property> </property>
<property name="capability" value ="ManageAccessRights"/> <property name="capability" value ="ManageAccessRights"/>
</bean> </bean>
<bean id="jsonConversionComponent.viewAuditLogAction" <bean id="jsonConversionComponent.viewAuditLogAction"
parent="jsonConversionComponent.baseAction"> parent="jsonConversionComponent.baseAction">
<property name="name" value="viewAuditLog"/> <property name="name" value="viewAuditLog"/>
@@ -537,7 +537,7 @@
<property name="name" value="export"/> <property name="name" value="export"/>
<property name="capability" value="ViewRecords"/> <property name="capability" value="ViewRecords"/>
</bean> </bean>
<bean id="jsonConversionComponent.relinquish" <bean id="jsonConversionComponent.relinquish"
parent="jsonConversionComponent.baseAction"> parent="jsonConversionComponent.baseAction">
<property name="name" value="relinquish"/> <property name="name" value="relinquish"/>

9
rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/security/RecordsManagementSecurityServiceImpl.java
View File

@@ -830,9 +830,12 @@ public class RecordsManagementSecurityServiceImpl implements RecordsManagementSe
AuthenticationUtil.runAs(new AuthenticationUtil.RunAsWork<Object>() AuthenticationUtil.runAs(new AuthenticationUtil.RunAsWork<Object>()
{ {
public Boolean doWork() throws Exception public Boolean doWork() throws Exception
{ {
if (recordsManagementService.isFilePlan(nodeRef) == false && if (recordsManagementService.isFilePlan(nodeRef) == true)
recordsManagementService.isRecordCategory(nodeRef) == true) {
setPermissionDown(nodeRef, authority, permission);
}
else if (recordsManagementService.isRecordCategory(nodeRef) == true)
{ {
setReadPermissionUp(nodeRef, authority); setReadPermissionUp(nodeRef, authority);
setPermissionDown(nodeRef, authority, permission); setPermissionDown(nodeRef, authority, permission);