dhis2-devs team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 11567
committer: Morten Olav Hansen <mortenoh@xxxxxxxxx>
branch nick: dhis2
timestamp: Mon 2013-08-05 14:09:17 +0700
message:
  minor fixes
modified:
  dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/javascript/anonymousRegistration.js
  dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/javascripts/dhis2/dhis2.storage.ls.js
  dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/javascripts/dhis2/dhis2.storage.memory.js
  dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/javascripts/dhis2/dhis2.storage.ss.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/anonymousRegistration.js'
--- dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/javascript/anonymousRegistration.js	2013-07-01 05:02:27 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/javascript/anonymousRegistration.js	2013-08-05 07:09:17 +0000
@@ -756,9 +756,11 @@
             }
 
             hideLoader();
+            showById( 'listDiv' );
         }
     } ).fail(function() {
         hideById( 'dataEntryInfor' );
+        hideById( 'listDiv' );
     } ).always(function() {
         var searchInfor = (listAll) ? i18n_list_all_events : i18n_search_events_by_dataelements;
         setInnerHTML( 'searchInforTD', searchInfor );
@@ -773,7 +775,6 @@
             showById( 'filterBtn' );
         }
 
-        showById( 'listDiv' );
         hideLoader();
     });
 }

=== modified file 'dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/javascripts/dhis2/dhis2.storage.ls.js'
--- dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/javascripts/dhis2/dhis2.storage.ls.js	2013-05-03 16:27:51 +0000
+++ dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/javascripts/dhis2/dhis2.storage.ls.js	2013-08-05 07:09:17 +0000
@@ -199,8 +199,9 @@
                 var deferred = $.Deferred();
                 var idx = this.indexer[store].all();
                 var objects = [];
+                var filtered = typeof predicate === 'function';
 
-                if ( typeof predicate !== 'undefined' ) {
+                if ( filtered ) {
                     // just log and continue
                     console.log( 'predicate filtering is currently not supported in dom storage getAll, returning all' );
                 }

=== modified file 'dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/javascripts/dhis2/dhis2.storage.memory.js'
--- dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/javascripts/dhis2/dhis2.storage.memory.js	2013-05-03 16:27:51 +0000
+++ dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/javascripts/dhis2/dhis2.storage.memory.js	2013-08-05 07:09:17 +0000
@@ -199,8 +199,9 @@
                 var deferred = $.Deferred();
                 var idx = this.indexer[store].all();
                 var objects = [];
+                var filtered = typeof predicate === 'function';
 
-                if ( typeof predicate !== 'undefined' ) {
+                if ( filtered ) {
                     // just log and continue
                     console.log( 'predicate filtering is currently not supported in dom storage getAll, returning all' );
                 }

=== modified file 'dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/javascripts/dhis2/dhis2.storage.ss.js'
--- dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/javascripts/dhis2/dhis2.storage.ss.js	2013-05-03 16:27:51 +0000
+++ dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/javascripts/dhis2/dhis2.storage.ss.js	2013-08-05 07:09:17 +0000
@@ -201,8 +201,9 @@
                 var deferred = $.Deferred();
                 var idx = this.indexer[store].all();
                 var objects = [];
+                var filtered = typeof predicate === 'function';
 
-                if ( typeof predicate !== 'undefined' ) {
+                if ( filtered ) {
                     // just log and continue
                     console.log( 'predicate filtering is currently not supported in dom storage getAll, returning all' );
                 }