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

Merge branch 'release/V2.4' of gitlab.alfresco.com:records-management/records-management into feature-2.4/RM-3148-RuleInheritancePatch

Browse Source
This commit is contained in:
Roy Wetherall
2016-03-30 09:44:33 +11:00
parent 49d91d9f79 5c8d4eec36
commit 20a7a01760
3 changed files with 59 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/action/RecordsManagementActionConditionEvaluatorAbstractBase.java
View File

@@ -189,7 +189,7 @@ public abstract class RecordsManagementActionConditionEvaluatorAbstractBase exte
((RecordsManagementActionConditionDefinitionImpl)actionConditionDefinition).setDescriptionKey(getDescriptionKey());
((RecordsManagementActionConditionDefinitionImpl)actionConditionDefinition).setAdhocPropertiesAllowed(getAdhocPropertiesAllowed());
((RecordsManagementActionConditionDefinitionImpl)actionConditionDefinition).setConditionEvaluator(name);
((RecordsManagementActionConditionDefinitionImpl)actionConditionDefinition).setParameterDefinitions(getParameterDefintions());
((RecordsManagementActionConditionDefinitionImpl)actionConditionDefinition).setLocalizedParameterDefinitions(getLocalizedParameterDefinitions());
}
return this.actionConditionDefinition;
}

7
rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/action/impl/DelegateAction.java
View File

@@ -94,4 +94,11 @@ public class DelegateAction extends RMActionExecuterAbstractBase
{
return delegateActionExecuter.getActionDefinition().getParameterDefinitions();
}
@Override
protected void addParameterDefinitions(List<ParameterDefinition> paramList)
{
super.addParameterDefinitions(paramList);
paramList.addAll(delegateActionExecuter.getActionDefinition().getParameterDefinitions());
}
}