dhis2-devs team mailing list archive

[noreply@xxxxxxxxxxxxx]

Merge authors:
  Jan Henrik Øverland (janhenrik-overland)
------------------------------------------------------------
revno: 18126 [merge]
committer: Jan Henrik Overland <janhenrik.overland@xxxxxxxxx>
branch nick: dhis2
timestamp: Tue 2015-01-27 13:41:08 +0100
message:
  Analysis, sharing issue fixed.
modified:
  dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-event-reports/scripts/app.js
  dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-event-visualizer/scripts/app.js
  dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/scripts/app.js
  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-event-reports/scripts/app.js'
--- dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-event-reports/scripts/app.js	2015-01-21 14:50:27 +0000
+++ dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-event-reports/scripts/app.js	2015-01-27 12:39:32 +0000
@@ -2952,6 +2952,11 @@
 			proxy: {
 				type: 'ajax',
 				url: ns.core.init.contextPath + '/api/sharing/search',
+                extraParams: {
+                    pageSize: 50
+                },
+                startParam: false,
+				limitParam: false,
 				reader: {
 					type: 'json',
 					root: 'userGroups'

=== modified file 'dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-event-visualizer/scripts/app.js'
--- dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-event-visualizer/scripts/app.js	2015-01-21 14:50:27 +0000
+++ dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-event-visualizer/scripts/app.js	2015-01-27 12:39:32 +0000
@@ -2592,6 +2592,11 @@
 			proxy: {
 				type: 'ajax',
 				url: ns.core.init.contextPath + '/api/sharing/search',
+                extraParams: {
+                    pageSize: 50
+                },
+                startParam: false,
+				limitParam: false,
 				reader: {
 					type: 'json',
 					root: 'userGroups'

=== modified file 'dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/scripts/app.js'
--- dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/scripts/app.js	2015-01-23 16:11:33 +0000
+++ dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/scripts/app.js	2015-01-27 12:39:32 +0000
@@ -2433,6 +2433,11 @@
 			proxy: {
 				type: 'ajax',
 				url: gis.init.contextPath + '/api/sharing/search',
+                extraParams: {
+                    pageSize: 50
+                },
+                startParam: false,
+				limitParam: false,
 				reader: {
 					type: 'json',
 					root: 'userGroups'

=== 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	2015-01-21 23:59:57 +0000
+++ dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-pivot/scripts/app.js	2015-01-27 12:39:32 +0000
@@ -1681,6 +1681,11 @@
 			proxy: {
 				type: 'ajax',
 				url: ns.core.init.contextPath + '/api/sharing/search',
+                extraParams: {
+                    pageSize: 50
+                },
+                startParam: false,
+				limitParam: false,
 				reader: {
 					type: 'json',
 					root: 'userGroups'

=== 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	2015-01-21 23:59:57 +0000
+++ dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-visualizer/scripts/app.js	2015-01-27 12:39:32 +0000
@@ -1726,6 +1726,11 @@
 			proxy: {
 				type: 'ajax',
 				url: ns.core.init.contextPath + '/api/sharing/search',
+                extraParams: {
+                    pageSize: 50
+                },
+                startParam: false,
+				limitParam: false,
 				reader: {
 					type: 'json',
 					root: 'userGroups'