From cf171d2ff9b629216eecca578acde9d2ebdcd7e6 Mon Sep 17 00:00:00 2001
From: Tuna Aksoy <tuna.aksoy@alfresco.com>
Date: Tue, 20 Aug 2013 22:19:26 +0000
Subject: [PATCH] RM-858 (RM Set Property Value text field is missing on return
 to the rules edit page)

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/modules/recordsmanagement/HEAD@54312 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
---
 .../rm-action-context.xml                     | 41 ++++++++++---------
 1 file changed, 21 insertions(+), 20 deletions(-)

diff --git a/rm-server/config/alfresco/module/org_alfresco_module_rm/rm-action-context.xml b/rm-server/config/alfresco/module/org_alfresco_module_rm/rm-action-context.xml
index 05e0cf69c1..84b17616f8 100644
--- a/rm-server/config/alfresco/module/org_alfresco_module_rm/rm-action-context.xml
+++ b/rm-server/config/alfresco/module/org_alfresco_module_rm/rm-action-context.xml
@@ -21,26 +21,26 @@
             <value>RECORD</value>
          </list>
       </property>
-   </bean>   
+   </bean>
 
    <bean id="rm-ac-disposition-action-relative-positions" class="org.alfresco.repo.action.constraint.EnumParameterConstraint" parent="action-constraint">
       <property name="enumClassName" value="org.alfresco.module.org_alfresco_module_rm.action.evaluator.DispositionActionRelativePositions" />
-   </bean>   
+   </bean>
 
    <bean id="rm-ac-disposition-actions" class="org.alfresco.module.org_alfresco_module_rm.action.constraint.DispositionActionParameterConstraint" parent="action-constraint">
       <property name="recordsManagementActionService" ref="RecordsManagementActionService"/>
-   </bean>   
+   </bean>
 
    <bean id="rm-ac-record-types" class="org.alfresco.module.org_alfresco_module_rm.action.constraint.RecordTypeParameterConstraint" parent="action-constraint">
       <property name="recordService" ref="RecordService"/>
       <property name="dictionaryService" ref="DictionaryService"/>
-   </bean>   
-   
-   <bean id="rm-ac-manual-events" class="org.alfresco.module.org_alfresco_module_rm.action.constraint.ManualEventParameterConstraint" parent="action-constraint">      
+   </bean>
+
+   <bean id="rm-ac-manual-events" class="org.alfresco.module.org_alfresco_module_rm.action.constraint.ManualEventParameterConstraint" parent="action-constraint">
       <property name="recordsManagementEventService" ref="RecordsManagementEventService"/>
    </bean>
-   
-   <bean id="rm-ac-scripts" class="org.alfresco.repo.action.constraint.FolderContentsParameterConstraint" parent="action-constraint">      
+
+   <bean id="rm-ac-scripts" class="org.alfresco.repo.action.constraint.FolderContentsParameterConstraint" parent="action-constraint">
       <property name="dictionaryService" ref="DictionaryService"/>
       <property name="searchService" ref="SearchService"/>
       <property name="nodeService" ref="NodeService"/>
@@ -54,40 +54,40 @@
          </list>
       </property>
    </bean>
-      
+
    <!--  Conditions -->
    <bean id="rmCapabilityConditionEvaluator"
          parent="action-condition-evaluator"
          abstract="true"
          class="org.alfresco.module.org_alfresco_module_rm.action.evaluator.CapabilityConditionEvaluator">
       <property name="recordsManagementActionService" ref="RecordsManagementActionService" />
-      <property name="retryingTransactionHelper" ref="retryingTransactionHelper" />      
+      <property name="retryingTransactionHelper" ref="retryingTransactionHelper" />
    </bean>
 
-   <bean id="isKind" 
-         parent="action-condition-evaluator" 
+   <bean id="isKind"
+         parent="action-condition-evaluator"
          class="org.alfresco.module.org_alfresco_module_rm.action.evaluator.IsKindEvaluator">
       <property name="recordsManagementActionService" ref="RecordsManagementActionService" />
       <property name="retryingTransactionHelper" ref="retryingTransactionHelper" />
       <property name="filePlanService" ref="FilePlanService" />
    </bean>
 
-   <bean id="hasDispositionAction" 
-         parent="action-condition-evaluator" 
+   <bean id="hasDispositionAction"
+         parent="action-condition-evaluator"
          class="org.alfresco.module.org_alfresco_module_rm.action.evaluator.HasDispositionActionEvaluator">
       <property name="recordsManagementActionService" ref="RecordsManagementActionService" />
       <property name="retryingTransactionHelper" ref="retryingTransactionHelper" />
       <property name="dispositionService" ref="DispositionService" />
    </bean>
 
-   <bean id="isRecordType" 
-         parent="action-condition-evaluator" 
+   <bean id="isRecordType"
+         parent="action-condition-evaluator"
          class="org.alfresco.module.org_alfresco_module_rm.action.evaluator.IsRecordTypeEvaluator">
       <property name="recordsManagementActionService" ref="RecordsManagementActionService" />
       <property name="retryingTransactionHelper" ref="retryingTransactionHelper" />
       <property name="nodeService" ref="NodeService" />
    </bean>
-   
+
    <bean id="isCutoff" parent="rmCapabilityConditionEvaluator">
       <property name="capabilityCondition" ref="capabilityCondition.cutoff"/>
    </bean>
@@ -103,7 +103,7 @@
    <bean id="isFrozen" parent="rmCapabilityConditionEvaluator">
       <property name="capabilityCondition" ref="capabilityCondition.frozen"/>
    </bean>
-   
+
    <bean id="isRecordFiled" parent="rmCapabilityConditionEvaluator">
    	  <property name="capabilityCondition" ref="capabilityCondition.recordFiled"/>
    </bean>
@@ -177,7 +177,7 @@
          </value>
       </property>
    </bean>
-      
+
     <!-- Cutoff action -->
 
    <bean id="cutoff_proxy" parent="rmProxyAction" >
@@ -908,6 +908,7 @@
    <bean id="setPropertyValue" class="org.alfresco.module.org_alfresco_module_rm.action.impl.DelegateAction">
       <property name="publicAction" value="true"/>
       <property name="delegateAction" ref="set-property-value" />
+      <property name="adhocPropertiesAllowed" value="true" />
    </bean>
-       
+
 </beans>
\ No newline at end of file