dhis2-devs team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 12551
committer: Morten Olav Hansen <mortenoh@xxxxxxxxx>
branch nick: dhis2
timestamp: Thu 2013-10-10 11:22:23 +0200
message:
  fixed potential bug in entry.js
modified:
  dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/javascript/entry.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-caseentry/src/main/webapp/dhis-web-caseentry/javascript/entry.js'
--- dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/javascript/entry.js	2013-10-10 08:21:54 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/javascript/entry.js	2013-10-10 09:22:23 +0000
@@ -775,20 +775,24 @@
                 $('#commentInput').attr('disabled', true);
                 $('#commentButton').attr('disabled', true);
                 $('#validateBtn').attr('disabled', true);
+
+                if( always ) always();
             } else {
-                loadProgramStageFromServer( programStageInstanceId );
+                loadProgramStageFromServer(programStageInstanceId).done(function() {
+                    if( always ) always();
+                });
             }
 
         });
     } else {
-        loadProgramStageFromServer( programStageInstanceId );
+        loadProgramStageFromServer(programStageInstanceId).done(function() {
+            if( always ) always();
+        });
     }
-
-    if( always ) always();
 }
 
 function loadProgramStageFromServer( programStageInstanceId ) {
-    $.ajax({
+    return $.ajax({
         url: 'getProgramStageInstance.action',
         cache: false,
         data: {