dhis2-devs team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 7238
committer: Lars Helge Overland <larshelge@xxxxxxxxx>
branch nick: dhis2
timestamp: Thu 2012-06-07 15:45:42 +0200
message:
  Increasing data set version when adding custom form
modified:
  dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/java/org/hisp/dhis/dataset/action/dataentryform/SaveDataEntryFormAction.java


--
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/dataentryform/SaveDataEntryFormAction.java'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/java/org/hisp/dhis/dataset/action/dataentryform/SaveDataEntryFormAction.java	2012-06-04 16:20:41 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/java/org/hisp/dhis/dataset/action/dataentryform/SaveDataEntryFormAction.java	2012-06-07 13:45:42 +0000
@@ -104,7 +104,8 @@
         
         DataEntryForm form = dataset.getDataEntryForm();
 
-        if ( ( form != null && form.getStyle() != null && !form.getStyle().equals( style ) ) ||
+        if ( form == null || form.getHtmlCode() == null ||
+            ( form != null && form.getStyle() != null && !form.getStyle().equals( style ) ) ||
             ( form != null && form.getHtmlCode() != null && !form.getHtmlCode().equals( designTextarea ) ) )
         {
             dataset.increaseVersion(); // Check if version must be updated