dhis2-devs team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 6006
committer: Morten Olav Hansen <mortenoh@xxxxxxxxx>
branch nick: dhis2
timestamp: Fri 2012-02-17 13:19:09 +0700
message:
  several minor fixes
modified:
  dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/cacheManifest.vm
  dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/javascripts/dhis2/dhis2.util.js
  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-commons-resources/src/main/webapp/cacheManifest.vm'
--- dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/cacheManifest.vm	2012-01-18 06:11:17 +0000
+++ dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/cacheManifest.vm	2012-02-17 06:19:09 +0000
@@ -1,5 +1,5 @@
 CACHE MANIFEST
-# 2.7-SNAPSHOT Version 2
+# 2.7-SNAPSHOT Version 3
 NETWORK:
 *
 CACHE:

=== modified file 'dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/javascripts/dhis2/dhis2.util.js'
--- dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/javascripts/dhis2/dhis2.util.js	2011-12-26 10:07:59 +0000
+++ dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/javascripts/dhis2/dhis2.util.js	2012-02-17 06:19:09 +0000
@@ -31,7 +31,7 @@
 /**
  * Creates namespace object based on path
  * 
- * @param path {String}�The path of the namespace, i.e. 'a.b.c'
+ * @param path {String} The path of the namespace, i.e. 'a.b.c'
  * 
  * @returns {object} Namespace object
  */

=== 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	2012-02-17 05:37:34 +0000
+++ dhis-2/dhis-web/dhis-web-dataentry/src/main/webapp/dhis-web-dataentry/javascript/form.js	2012-02-17 06:19:09 +0000
@@ -205,19 +205,13 @@
             cache: false,
             success: function( data, textStatus, jqXHR )
             {
-                if(data.c == 2) {
-                    log( 'DataSet is now locked' );
-
-                    setHeaderMessage( i18n_dataset_is_locked );
-                } else {
-                    log( 'Successfully saved complete dataset with value: ' + value );
-                    storageManager.clearCompleteDataSet( value );
-                    ( array = array.slice( 1 ) ).length && pushCompleteDataSets( array );
-
-                    if ( array.length < 1 )
-                    {
-                        setHeaderDelayMessage( i18n_sync_success );
-                    }
+                log( 'Successfully saved complete dataset with value: ' + value );
+                storageManager.clearCompleteDataSet( value );
+                ( array = array.slice( 1 ) ).length && pushCompleteDataSets( array );
+
+                if ( array.length < 1 )
+                {
+                    setHeaderDelayMessage( i18n_sync_success );
                 }
             },
             error: function( jqXHR, textStatus, errorThrown )
@@ -256,17 +250,23 @@
             cache: false,
             success: function( data, textStatus, jqXHR )
             {
-                storageManager.clearDataValueJSON( value );
-                log( 'Successfully saved data value with value: ' + value );
-                ( array = array.slice( 1 ) ).length && pushDataValues( array );
-
-                if ( array.length < 1 && completeDataSetsArray.length > 0 )
-                {
-                    pushCompleteDataSets( completeDataSetsArray );
-                }
-                else
-                {
-                    setHeaderDelayMessage( i18n_sync_success );
+                if(data.c == 2) {
+                    log( 'DataSet is now locked' );
+
+                    setHeaderMessage( i18n_dataset_is_locked );
+                } else {
+                    storageManager.clearDataValueJSON( value );
+                    log( 'Successfully saved data value with value: ' + value );
+                    ( array = array.slice( 1 ) ).length && pushDataValues( array );
+
+                    if ( array.length < 1 && completeDataSetsArray.length > 0 )
+                    {
+                        pushCompleteDataSets( completeDataSetsArray );
+                    }
+                    else
+                    {
+                        setHeaderDelayMessage( i18n_sync_success );
+                    }
                 }
             },
             error: function( jqXHR, textStatus, errorThrown )