dhis2-devs team mailing list archive

[noreply@xxxxxxxxxxxxx]

Merge authors:
  Jan Henrik Øverland (janhenrik-overland)
------------------------------------------------------------
revno: 16965 [merge]
committer: Jan Henrik Overland <janhenrik.overland@xxxxxxxxx>
branch nick: dhis2
timestamp: Mon 2014-10-06 15:33:52 +0200
message:
  PT DV store sorting.
modified:
  dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-pivot/scripts/app.js
  dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-visualizer/scripts/app.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-apps/src/main/webapp/dhis-web-pivot/scripts/app.js'
--- dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-pivot/scripts/app.js	2014-10-03 15:43:26 +0000
+++ dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-pivot/scripts/app.js	2014-10-06 12:01:56 +0000
@@ -2672,6 +2672,8 @@
             },
             loadStore: function(data, pager, append) {
                 this.loadData(data, append);
+                this.sortStore();
+                
                 this.lastPage = this.nextPage;
 
                 if (pager.pageCount > this.nextPage) {
@@ -2848,6 +2850,8 @@
 			},
             loadStore: function(data, pager, append) {
                 this.loadData(data, append);
+                this.sortStore();
+                
                 this.lastPage = this.nextPage;
 
                 if (pager.pageCount > this.nextPage) {
@@ -2950,6 +2954,8 @@
             },
             loadStore: function(data, pager, append) {
                 this.loadData(data, append);
+                this.sortStore();
+                
                 this.lastPage = this.nextPage;
 
                 if (pager.pageCount > this.nextPage) {

=== modified file 'dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-visualizer/scripts/app.js'
--- dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-visualizer/scripts/app.js	2014-09-29 15:12:43 +0000
+++ dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-visualizer/scripts/app.js	2014-10-06 12:01:56 +0000
@@ -2660,6 +2660,8 @@
             },
             loadStore: function(data, pager, append) {
                 this.loadData(data, append);
+                this.sortStore();
+                
                 this.lastPage = this.nextPage;
 
                 if (pager.pageCount > this.nextPage) {
@@ -2838,6 +2840,8 @@
 			},
             loadStore: function(data, pager, append) {
                 this.loadData(data, append);
+                this.sortStore();
+                
                 this.lastPage = this.nextPage;
 
                 if (pager.pageCount > this.nextPage) {
@@ -2940,6 +2944,8 @@
             },
             loadStore: function(data, pager, append) {
                 this.loadData(data, append);
+                this.sortStore();
+                
                 this.lastPage = this.nextPage;
 
                 if (pager.pageCount > this.nextPage) {