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

RM-324: User with Edit Selection Lists capability can't access "List of Values" tool from Management Console

Browse Source 
* Added 'ListAdmin' unassignable capability 
  * Fixed up introduced issue with console permissions (last minute change to JS caused all capability checks to fail on management console .. for some reason I didn't recycle and spot untill today!)
  * Can not undeclare a cutoff record (another small issue spotted today)




git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/modules/recordsmanagement/BRANCHES/V2.0@37126 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Roy Wetherall
2012-05-29 07:34:03 +00:00
parent 35bbdb09b0
commit b8b25ddc5f
5 changed files with 48 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
rm-server/config/alfresco/module/org_alfresco_module_rm/capability/rm-capabilities-list-context.xml Normal file
View File

@@ -0,0 +1,34 @@
<?xml version='1.0' encoding='UTF-8'?>
<!DOCTYPE beans PUBLIC '-//SPRING//DTD BEAN//EN' 'http://www.springframework.org/dtd/spring-beans.dtd'>
<beans>
<!-- Assignable Capabilities -->
<bean id="rmCreateAndAssociateSelectionListsCapability"
parent="declarativeCapability">
<property name="name" value="CreateAndAssociateSelectionLists"/>
<property name="permission" value="CreateAndAssociateSelectionLists"/>
</bean>
<bean id="rmEditSelectionListsCapability"
parent="declarativeCapability">
<property name="name" value="EditSelectionLists" />
<property name="permission" value="EditSelectionLists" />
</bean>
<!-- Non-Assignable Capabilities -->
<bean id="rmListAdmin"
parent="compositeCapability">
<property name="name" value="ListAdmin"/>
<property name="private" value="true"/>
<property name="capabilities">
<list>
<ref bean="rmCreateAndAssociateSelectionListsCapability"/>
<ref bean="rmEditSelectionListsCapability"/>
</list>
</property>
</bean>
</beans>

4
rm-server/config/alfresco/module/org_alfresco_module_rm/capability/rm-capabilities-record-context.xml
View File

@@ -23,6 +23,7 @@
<entry key="capabilityCondition.filling" value="true"/>
<entry key="capabilityCondition.frozen" value="false"/>
<entry key="capabilityCondition.declared" value="true"/>
<entry key="capabilityCondition.cutoff" value="false"/>
</map>
</property>
</bean>
@@ -98,8 +99,7 @@
<map>
<entry key="capabilityCondition.filling" value="true"/>
<entry key="capabilityCondition.cutoff" value="false"/>
<entry key="capabilityCondition.frozen" value="false"/>
<entry key="capabilityCondition.closed" value="false"/>
<entry key="capabilityCondition.frozen" value="false"/>
<entry key="capabilityCondition.declared" value="false"/>
</map>
</property>

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

@@ -66,12 +66,6 @@
</property>
</bean>
<bean id="rmCreateAndAssociateSelectionListsCapability"
parent="declarativeCapability">
<property name="name" value="CreateAndAssociateSelectionLists"/>
<property name="permission" value="CreateAndAssociateSelectionLists"/>
</bean>
<bean id="rmCreateModifyDestroyClassificationGuidesCapability"
parent="declarativeCapability">
<property name="name" value="CreateModifyDestroyClassificationGuides"/>
@@ -162,12 +156,6 @@
<property name="permission" value="DisplayRightsReport" />
</bean>
<bean id="rmEditSelectionListsCapability"
parent="declarativeCapability">
<property name="name" value="EditSelectionLists" />
<property name="permission" value="EditSelectionLists" />
</bean>
<bean id="rmMakeOptionalPropertiesMandatoryCapability"
parent="declarativeCapability">
<property name="name" value="MakeOptionalParametersMandatory" />
@@ -294,6 +282,9 @@
<!-- Audit capabilities -->
<import resource="classpath:alfresco/module/org_alfresco_module_rm/capability/rm-capabilities-audit-context.xml"/>
<!-- List capabilities -->
<import resource="classpath:alfresco/module/org_alfresco_module_rm/capability/rm-capabilities-list-context.xml"/>
<!-- Group capabilities -->
<import resource="classpath:alfresco/module/org_alfresco_module_rm/capability/rm-capabilities-group-context.xml"/>

8
rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/capability/declarative/CompositeCapability.java
View File

@@ -43,6 +43,9 @@ public class CompositeCapability extends DeclarativeCapability
this.capabilities = capabilities;
}
/**
* @see org.alfresco.module.org_alfresco_module_rm.capability.declarative.DeclarativeCapability#evaluateImpl(org.alfresco.service.cmr.repository.NodeRef)
*/
@Override
public int evaluateImpl(NodeRef nodeRef)
{
@@ -66,6 +69,11 @@ public class CompositeCapability extends DeclarativeCapability
return result;
}
/**
* If a target capability is specified then we evaluate that. Otherwise we combine the results of the provided capabilities.
*
* @see org.alfresco.module.org_alfresco_module_rm.capability.declarative.DeclarativeCapability#evaluate(org.alfresco.service.cmr.repository.NodeRef, org.alfresco.service.cmr.repository.NodeRef)
*/
@Override
public int evaluate(NodeRef source, NodeRef target)
{

2
rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/capability/impl/UpdatePropertiesCapability.java
View File

@@ -28,7 +28,7 @@ import org.alfresco.service.cmr.repository.NodeRef;
import org.alfresco.service.namespace.QName;
/**
* Update properties capability
* Update properties capability.
*
* @author andyh
*/