dhis2-devs team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 12987
committer: Morten Olav Hansen <mortenoh@xxxxxxxxx>
branch nick: dhis2
timestamp: Wed 2013-11-20 13:15:10 +0100
message:
  support multiorg on default forms
modified:
  dhis-2/dhis-web/dhis-web-dataentry/src/main/java/org/hisp/dhis/de/action/LoadFormAction.java
  dhis-2/dhis-web/dhis-web-dataentry/src/main/webapp/dhis-web-dataentry/javascript/form.js


--
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-dataentry/src/main/java/org/hisp/dhis/de/action/LoadFormAction.java'
--- dhis-2/dhis-web/dhis-web-dataentry/src/main/java/org/hisp/dhis/de/action/LoadFormAction.java	2013-09-18 09:33:46 +0000
+++ dhis-2/dhis-web/dhis-web-dataentry/src/main/java/org/hisp/dhis/de/action/LoadFormAction.java	2013-11-20 12:15:10 +0000
@@ -234,7 +234,7 @@
     public String execute()
         throws Exception
     {
-                
+
         dataSet = dataSetService.getDataSet( dataSetId, true, false, false, true );
 
         List<DataElement> dataElements = new ArrayList<DataElement>( dataElementService.getDataElements( dataSet, null,
@@ -328,6 +328,7 @@
                 Section section = new Section();
                 section.setUid( CodeGenerator.generateCode() );
                 section.setId( i );
+                section.setName( orderedCategoryCombos.get( i ).getName() );
                 section.setSortOrder( i );
                 section.setDataSet( dataSet );
                 dataSet.getSections().add( section );
@@ -377,7 +378,7 @@
         {
             getOtherDataEntryForm( dataElements, dataSet );
         }
-        
+
         return displayMode;
     }
 

=== modified file 'dhis-2/dhis-web/dhis-web-dataentry/src/main/webapp/dhis-web-dataentry/javascript/form.js'
--- dhis-2/dhis-web/dhis-web-dataentry/src/main/webapp/dhis-web-dataentry/javascript/form.js	2013-11-20 10:28:18 +0000
+++ dhis-2/dhis-web/dhis-web-dataentry/src/main/webapp/dhis-web-dataentry/javascript/form.js	2013-11-20 12:15:10 +0000
@@ -805,7 +805,7 @@
             }
         } );
 
-        if ( !found && formType == FORMTYPE_SECTION )
+        if ( !found && ( formType == FORMTYPE_SECTION || formType == FORMTYPE_DEFAULT ) )
         {
             filteredDataSetList.push(item);
         }