dhis2-devs team mailing list archive

[noreply@xxxxxxxxxxxxx]

Merge authors:
  Jan Henrik Øverland (janhenrik-overland)
------------------------------------------------------------
revno: 10379 [merge]
committer: Jan Henrik Overland <janhenrik.overland@xxxxxxxxx>
branch nick: dhis2
timestamp: Thu 2013-03-21 12:48:29 +0100
message:
  (PT, DV, GIS) Sharing access.
modified:
  dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/app/scripts/app.js
  dhis-2/dhis-web/dhis-web-pivot/src/main/webapp/dhis-web-pivot/app/scripts/app.js
  dhis-2/dhis-web/dhis-web-visualizer/src/main/webapp/dhis-web-visualizer/app/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-mapping/src/main/webapp/dhis-web-mapping/app/scripts/app.js'
--- dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/app/scripts/app.js	2013-03-20 16:27:17 +0000
+++ dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/app/scripts/app.js	2013-03-21 11:45:40 +0000
@@ -2107,12 +2107,12 @@
 						{
 							iconCls: 'gis-grid-row-icon-sharing',
 							getClass: function(value, metaData, record) {
-								return 'tooltip-favorite-sharing' + (!record.data.access.update ? ' disabled' : '');
+								return 'tooltip-favorite-sharing' + (!record.data.access.manage ? ' disabled' : '');
 							},
 							handler: function(grid, rowIndex) {
 								var record = this.up('grid').store.getAt(rowIndex);
 
-								if (record.data.access.update) {
+								if (record.data.access.manage) {
 									Ext.Ajax.request({
 										url: pt.baseUrl + '/api/sharing?type=map&id=' + record.data.id,
 										method: 'GET',

=== modified file 'dhis-2/dhis-web/dhis-web-pivot/src/main/webapp/dhis-web-pivot/app/scripts/app.js'
--- dhis-2/dhis-web/dhis-web-pivot/src/main/webapp/dhis-web-pivot/app/scripts/app.js	2013-03-20 16:27:17 +0000
+++ dhis-2/dhis-web/dhis-web-pivot/src/main/webapp/dhis-web-pivot/app/scripts/app.js	2013-03-21 11:45:40 +0000
@@ -1451,12 +1451,12 @@
 						{
 							iconCls: 'pt-grid-row-icon-sharing',
 							getClass: function(value, metaData, record) {
-								return 'tooltip-favorite-sharing' + (!record.data.access.update ? ' disabled' : '');
+								return 'tooltip-favorite-sharing' + (!record.data.access.manage ? ' disabled' : '');
 							},
 							handler: function(grid, rowIndex) {
 								var record = this.up('grid').store.getAt(rowIndex);
 
-								if (record.data.access.update) {
+								if (record.data.access.manage) {
 									Ext.Ajax.request({
 										url: pt.baseUrl + '/api/sharing?type=reportTable&id=' + record.data.id,
 										method: 'GET',

=== modified file 'dhis-2/dhis-web/dhis-web-visualizer/src/main/webapp/dhis-web-visualizer/app/scripts/app.js'
--- dhis-2/dhis-web/dhis-web-visualizer/src/main/webapp/dhis-web-visualizer/app/scripts/app.js	2013-03-20 16:27:17 +0000
+++ dhis-2/dhis-web/dhis-web-visualizer/src/main/webapp/dhis-web-visualizer/app/scripts/app.js	2013-03-21 11:45:40 +0000
@@ -3017,12 +3017,12 @@
 						{
 							iconCls: 'dv-grid-row-icon-sharing',
 							getClass: function(value, metaData, record) {
-								return 'tooltip-favorite-sharing' + (!record.data.access.update ? ' disabled' : '');
+								return 'tooltip-favorite-sharing' + (!record.data.access.manage ? ' disabled' : '');
 							},
 							handler: function(grid, rowIndex) {
 								var record = this.up('grid').store.getAt(rowIndex);
 
-								if (record.data.access.update) {
+								if (record.data.access.manage) {
 									Ext.Ajax.request({
 										url: DV.init.contextPath + '/api/sharing?type=chart&id=' + record.data.id,
 										method: 'GET',