------------------------------------------------------------
revno: 3480
committer: Lars Helge Overland <larshe...@gmail.com>
branch nick: dhis2
timestamp: Wed 2011-04-27 19:36:37 +0200
message:
Minor fix re data entry forms
modified:
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/java/org/hisp/dhis/dataset/action/dataentryform/ViewDataEntryFormAction.java
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/webapp/dhis-web-maintenance-dataset/viewDataEntryForm.vm
--
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/ViewDataEntryFormAction.java'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/java/org/hisp/dhis/dataset/action/dataentryform/ViewDataEntryFormAction.java 2011-04-27 16:07:05 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/java/org/hisp/dhis/dataset/action/dataentryform/ViewDataEntryFormAction.java 2011-04-27 17:36:37 +0000
@@ -112,9 +112,9 @@
return dataSet;
}
- private Boolean autoSave;
+ private boolean autoSave;
- public Boolean getAutoSave()
+ public boolean getAutoSave()
{
return autoSave;
}
=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/webapp/dhis-web-maintenance-dataset/viewDataEntryForm.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/webapp/dhis-web-maintenance-dataset/viewDataEntryForm.vm 2011-04-27 08:32:13 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/webapp/dhis-web-maintenance-dataset/viewDataEntryForm.vm 2011-04-27 17:36:37 +0000
@@ -14,18 +14,22 @@
});
var editor = jQuery("#designTextarea").ckeditorGet();
+
+ #if( $dataEntryForm )
editor.setData('$encoder.jsEscape( $dataEntryValue, "'" )');
+ #end
});
- var stat = ('$!dataEntryForm') ? "EDIT" : "ADD";
+ var stat = "ADD";
var dataEntryFormId = -1;
var selected = null;
- var autoSave = '$!autoSave';
+ var autoSave = $autoSave;
var t;
- var timer_is_on=0;
+ var timer_is_on = 0;
- #if($!dataEntryForm)
- dataEntryFormId = $dataEntryForm.id;
+ #if( $dataEntryForm )
+ stat = "EDIT";
+ dataEntryFormId = $dataEntryForm.id;
#end
var i18n_confirm_delete = '$encoder.jsEscape( $i18n.getString( "dataentryform_confirm_delete" ) , "'" )';
_______________________________________________
Mailing list: https://launchpad.net/~dhis2-devs
Post to : dhis2-devs@lists.launchpad.net
Unsubscribe : https://launchpad.net/~dhis2-devs
More help : https://help.launchpad.net/ListHelp
