dhis2-devs team mailing list archive

Thread
Date

[Branch ~dhis2-devs-core/dhis2/trunk] Rev 2604: Fixed bug 'Section grey field management error'

To: DHIS 2 developers <dhis2-devs@xxxxxxxxxxxxxxxxxxx>
From: noreply@xxxxxxxxxxxxx
Date: Mon, 17 Jan 2011 17:25:50 -0000
Reply-to: noreply@xxxxxxxxxxxxx
Sender: bounces@xxxxxxxxxxxxx

------------------------------------------------------------
revno: 2604
committer: Lars Helge Overland <larshelge@xxxxxxxxx>
branch nick: dhis2
timestamp: Mon 2011-01-17 18:24:05 +0100
message:
  Fixed bug 'Section grey field management error'
modified:
  dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/java/org/hisp/dhis/dataset/action/section/SaveSectionGreyStatusAction.java
  dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/resources/META-INF/dhis/beans.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

=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/java/org/hisp/dhis/dataset/action/section/SaveSectionGreyStatusAction.java'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/java/org/hisp/dhis/dataset/action/section/SaveSectionGreyStatusAction.java	2010-07-07 10:56:07 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/java/org/hisp/dhis/dataset/action/section/SaveSectionGreyStatusAction.java	2011-01-17 17:24:05 +0000
@@ -158,8 +158,7 @@
         if ( dataElementOperandService.getDataElementOperand( operand ) == null )
         {            
             dataElementOperandService.addDataElementOperand( operand );
-        }
-        
+        }        
         else
         {
             operand = dataElementOperandService.getDataElementOperand( operand );

=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/resources/META-INF/dhis/beans.xml'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/resources/META-INF/dhis/beans.xml	2011-01-11 17:04:20 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/resources/META-INF/dhis/beans.xml	2011-01-17 17:24:05 +0000
@@ -131,9 +131,12 @@
 		<property name="dataElementService">
 			<ref bean="org.hisp.dhis.dataelement.DataElementService"/>
 		</property>
+		<property name="dataElementOperandService">
+			<ref bean="org.hisp.dhis.dataelement.DataElementOperandService"/>
+		</property>
 		<property name="categoryService">
 			<ref bean="org.hisp.dhis.dataelement.DataElementCategoryService"/>
-		</property>		
+		</property>
 	</bean>
 	
 	<bean id="org.hisp.dhis.dataset.action.section.SaveSectionSortOrderAction"