dhis2-devs team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 1662
committer: Lars Helge Oeverland <larshelge@xxxxxxxxx>
branch nick: trunk
timestamp: Wed 2010-03-17 15:24:39 +0100
message:
  Centralized the operand xml response template
removed:
  dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/responseOperandList.vm
  dhis-2/dhis-web/dhis-web-validationrule/src/main/webapp/dhis-web-validationrule/responseOperandList.vm
added:
  dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/ajax/xmlOperands.vm
modified:
  dhis-2/dhis-web/dhis-web-commons/src/main/resources/dhis-web-commons.xml
  dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/resources/struts.xml
  dhis-2/dhis-web/dhis-web-validationrule/src/main/resources/struts.xml


--
lp:dhis2
https://code.launchpad.net/~dhis2-devs-core/dhis2/trunk

Your team DHIS 2 developers is subscribed to branch lp:dhis2.
To unsubscribe from this branch go to https://code.launchpad.net/~dhis2-devs-core/dhis2/trunk/+edit-subscription.

=== added file 'dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/ajax/xmlOperands.vm'
--- dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/ajax/xmlOperands.vm	1970-01-01 00:00:00 +0000
+++ dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/ajax/xmlOperands.vm	2010-03-17 14:24:39 +0000
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<operands>
+#foreach ( $operand in $operands )
+    <operand>
+        <id>$operand.id</id>
+        <name>$encoder.xmlEncode( $operand.operandName )</name>
+        <dataElementId>$operand.dataElementId</dataElementId>
+        <categoryOptionComboId>$operand.optionComboId</categoryOptionComboId>
+        <operandName>$operand.operandName</operandName>
+    </operand>
+#end
+</operands>

=== modified file 'dhis-2/dhis-web/dhis-web-commons/src/main/resources/dhis-web-commons.xml'
--- dhis-2/dhis-web/dhis-web-commons/src/main/resources/dhis-web-commons.xml	2010-03-04 16:57:53 +0000
+++ dhis-2/dhis-web/dhis-web-commons/src/main/resources/dhis-web-commons.xml	2010-03-17 14:24:39 +0000
@@ -340,6 +340,12 @@
             <param name="onExceptionReturn">plainTextError</param>
 		</action>
 		
+        <action name="getOperands" class="org.hisp.dhis.commons.action.GetOperandsAction">
+            <result name="success" type="velocity-xml">
+                /dhis-web-commons/ajax/xmlOperands.vm</result>
+            <param name="onExceptionReturn">plainTextError</param>
+        </action>
+		
 	</package>
 
     <!-- Common actions JSON -->

=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/resources/struts.xml'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/resources/struts.xml	2010-02-26 03:26:44 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/resources/struts.xml	2010-03-17 14:24:39 +0000
@@ -55,7 +55,7 @@
 		<action name="getDataElementGroupMembers"
 			class="org.hisp.dhis.dd.action.dataelement.GetDataElementGroupMembersAction">
 			<result name="success" type="velocity-xml">
-				/dhis-web-maintenance-datadictionary/responseOperandList.vm</result>
+				/dhis-web-commons/ajax/xmlOperands.vm</result>
 			<param name="onExceptionReturn">plainTextError</param>
 		</action>
 
@@ -735,7 +735,7 @@
 		<action name="getFilteredDataElements"
 			class="org.hisp.dhis.dd.action.indicatordenum.GetFilteredDataElementsAction">
 			<result name="success" type="velocity-xml">
-				/dhis-web-maintenance-datadictionary/responseOperandList.vm</result>
+				/dhis-web-commons/ajax/xmlOperands.vm</result>
 			<param name="onExceptionReturn">plainTextError</param>
 		</action>
 

=== removed file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/responseOperandList.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/responseOperandList.vm	2009-03-03 16:46:36 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/responseOperandList.vm	1970-01-01 00:00:00 +0000
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<operands>
-#foreach ( $operand in $operands )
-	<operand>
-		<id>$operand.id</id>
-		<name>$encoder.xmlEncode( $operand.operandName )</name>		
-	</operand>
-#end
-</operands>

=== modified file 'dhis-2/dhis-web/dhis-web-validationrule/src/main/resources/struts.xml'
--- dhis-2/dhis-web/dhis-web-validationrule/src/main/resources/struts.xml	2010-02-10 19:12:22 +0000
+++ dhis-2/dhis-web/dhis-web-validationrule/src/main/resources/struts.xml	2010-03-17 14:24:39 +0000
@@ -89,7 +89,7 @@
     </action>    
     
     <action name="getFilteredDataElements" class="org.hisp.dhis.validationrule.action.GetFilteredDataElementsAction">
-      <result name="success" type="velocity-xml">/dhis-web-validationrule/responseOperandList.vm</result>			
+      <result name="success" type="velocity-xml">/dhis-web-commons/ajax/xmlOperands.vm</result>			
       <param name="onExceptionReturn">plainTextError</param>
     </action>
     

=== removed file 'dhis-2/dhis-web/dhis-web-validationrule/src/main/webapp/dhis-web-validationrule/responseOperandList.vm'
--- dhis-2/dhis-web/dhis-web-validationrule/src/main/webapp/dhis-web-validationrule/responseOperandList.vm	2009-03-03 16:46:36 +0000
+++ dhis-2/dhis-web/dhis-web-validationrule/src/main/webapp/dhis-web-validationrule/responseOperandList.vm	1970-01-01 00:00:00 +0000
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<operands>
-#foreach ( $operand in $operands )
-	<operand>
-		<id>$operand.id</id>
-		<name>$encoder.xmlEncode( $operand.operandName )</name>		
-	</operand>
-#end
-</operands>
\ No newline at end of file