mirror of
https://github.com/Alfresco/alfresco-community-repo.git
synced 2025-08-07 17:49:17 +00:00
Pre sprint demo review: ensure add to and remove from hold actions only appear when the user has holds to remove from or add to
* added capability condition that checks the heldBy (include or exclude) for filling permissions * add condition to addTo and removeFrom hold capabilities (UI automatically reflects new condition) git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/modules/recordsmanagement/HEAD@67102 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
@@ -202,4 +202,18 @@
|
|||||||
<property name="namespaceService" ref="NamespaceService" />
|
<property name="namespaceService" ref="NamespaceService" />
|
||||||
</bean>
|
</bean>
|
||||||
|
|
||||||
|
<bean id="capabilityCondition.hasFillingOnHolds"
|
||||||
|
parent="capabilityCondition.base"
|
||||||
|
class="org.alfresco.module.org_alfresco_module_rm.capability.declarative.condition.HoldCapabilityCondition">
|
||||||
|
<property name="includedInHold" value="false"/>
|
||||||
|
<property name="holdService" ref="HoldService" />
|
||||||
|
</bean>
|
||||||
|
|
||||||
|
<bean id="capabilityCondition.hasFillingOnHeld"
|
||||||
|
parent="capabilityCondition.base"
|
||||||
|
class="org.alfresco.module.org_alfresco_module_rm.capability.declarative.condition.HoldCapabilityCondition">
|
||||||
|
<property name="includedInHold" value="true"/>
|
||||||
|
<property name="holdService" ref="HoldService" />
|
||||||
|
</bean>
|
||||||
|
|
||||||
</beans>
|
</beans>
|
@@ -85,6 +85,7 @@
|
|||||||
<property name="conditions">
|
<property name="conditions">
|
||||||
<map>
|
<map>
|
||||||
<entry key="capabilityCondition.filling" value="true"/>
|
<entry key="capabilityCondition.filling" value="true"/>
|
||||||
|
<entry key="capabilityCondition.hasFillingOnHolds" value="true"/>
|
||||||
</map>
|
</map>
|
||||||
</property>
|
</property>
|
||||||
<property name="group"><ref bean="holdControlsGroup"/></property>
|
<property name="group"><ref bean="holdControlsGroup"/></property>
|
||||||
@@ -106,6 +107,7 @@
|
|||||||
<map>
|
<map>
|
||||||
<entry key="capabilityCondition.filling" value="true"/>
|
<entry key="capabilityCondition.filling" value="true"/>
|
||||||
<entry key="capabilityCondition.frozen" value="true"/>
|
<entry key="capabilityCondition.frozen" value="true"/>
|
||||||
|
<entry key="capabilityCondition.hasFillingOnHeld" value="true"/>
|
||||||
</map>
|
</map>
|
||||||
</property>
|
</property>
|
||||||
<property name="group"><ref bean="holdControlsGroup"/></property>
|
<property name="group"><ref bean="holdControlsGroup"/></property>
|
||||||
|
@@ -0,0 +1,78 @@
|
|||||||
|
/*
|
||||||
|
* Copyright (C) 2005-2014 Alfresco Software Limited.
|
||||||
|
*
|
||||||
|
* This file is part of Alfresco
|
||||||
|
*
|
||||||
|
* Alfresco is free software: you can redistribute it and/or modify
|
||||||
|
* it under the terms of the GNU Lesser General Public License as published by
|
||||||
|
* the Free Software Foundation, either version 3 of the License, or
|
||||||
|
* (at your option) any later version.
|
||||||
|
*
|
||||||
|
* Alfresco is distributed in the hope that it will be useful,
|
||||||
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||||
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||||
|
* GNU Lesser General Public License for more details.
|
||||||
|
*
|
||||||
|
* You should have received a copy of the GNU Lesser General Public License
|
||||||
|
* along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
|
||||||
|
*/
|
||||||
|
package org.alfresco.module.org_alfresco_module_rm.capability.declarative.condition;
|
||||||
|
|
||||||
|
import java.util.List;
|
||||||
|
|
||||||
|
import org.alfresco.module.org_alfresco_module_rm.capability.RMPermissionModel;
|
||||||
|
import org.alfresco.module.org_alfresco_module_rm.capability.declarative.AbstractCapabilityCondition;
|
||||||
|
import org.alfresco.module.org_alfresco_module_rm.hold.HoldService;
|
||||||
|
import org.alfresco.service.cmr.repository.NodeRef;
|
||||||
|
import org.alfresco.service.cmr.security.AccessStatus;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Add to hold evaluator.
|
||||||
|
* <p>
|
||||||
|
* Determines whether the current user has access to any holds.
|
||||||
|
*
|
||||||
|
* @author Roy Wetherall
|
||||||
|
*/
|
||||||
|
public class HoldCapabilityCondition extends AbstractCapabilityCondition
|
||||||
|
{
|
||||||
|
/** indicates whether to evaluate holds that the node is within or not within */
|
||||||
|
private boolean includedInHold = false;;
|
||||||
|
|
||||||
|
/** hold service */
|
||||||
|
private HoldService holdService;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @param includedInHold true if holds node within, false otherwise
|
||||||
|
*/
|
||||||
|
public void setIncludedInHold(boolean includedInHold)
|
||||||
|
{
|
||||||
|
this.includedInHold = includedInHold;
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @param holdService hold service
|
||||||
|
*/
|
||||||
|
public void setHoldService(HoldService holdService)
|
||||||
|
{
|
||||||
|
this.holdService = holdService;
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public boolean evaluate(NodeRef nodeRef)
|
||||||
|
{
|
||||||
|
boolean result = false;
|
||||||
|
|
||||||
|
List<NodeRef> holds = holdService.heldBy(nodeRef, includedInHold);
|
||||||
|
for (NodeRef hold : holds)
|
||||||
|
{
|
||||||
|
// return true as soon as we find one hold we have filling permission on
|
||||||
|
if (AccessStatus.ALLOWED.equals(permissionService.hasPermission(hold, RMPermissionModel.FILING)))
|
||||||
|
{
|
||||||
|
result = true;
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
return result;
|
||||||
|
}
|
||||||
|
}
|
Reference in New Issue
Block a user