dhis2-devs team mailing list archive

[noreply@xxxxxxxxxxxxx]

Merge authors:
  Jan Henrik Øverland (janhenrik-overland)
------------------------------------------------------------
revno: 4012 [merge]
committer: Jan Henrik Overland <janhenrik.overland@xxxxxxxxx>
branch nick: dhis2
timestamp: Thu 2011-06-23 20:26:56 +0300
message:
  Facility relocation disabled for non-admins.
modified:
  dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/mapping/javascript/index.js
  dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/resources/mapfish/widgets/geostat/Choropleth.js
  dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/resources/mapfish/widgets/geostat/Point.js
  dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/resources/mapfish/widgets/geostat/Symbol.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/mapping/javascript/index.js'
--- dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/mapping/javascript/index.js	2011-06-22 07:36:16 +0000
+++ dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/mapping/javascript/index.js	2011-06-23 17:18:32 +0000
@@ -2090,7 +2090,7 @@
                 qtip: 'Refresh layer',
                 handler: function() {
                     choropleth.updateValues = true;
-                    choropleth.loadGeoJson();
+                    choropleth.classify();
                 }
             },
             {
@@ -2125,7 +2125,7 @@
                 qtip: 'Refresh layer',
                 handler: function() {
                     point.updateValues = true;
-                    point.loadGeoJson();
+                    point.classify();
                 }
             },
             {
@@ -2159,7 +2159,7 @@
                 id: 'refresh',
                 qtip: 'Refresh layer',
                 handler: function() {
-                    symbol.loadGeoJson();
+                    symbol.classify();
                 }
             },
             {

=== modified file 'dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/resources/mapfish/widgets/geostat/Choropleth.js'
--- dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/resources/mapfish/widgets/geostat/Choropleth.js	2011-06-22 19:38:25 +0000
+++ dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/resources/mapfish/widgets/geostat/Choropleth.js	2011-06-23 17:18:32 +0000
@@ -1246,6 +1246,7 @@
                         {
                             text: 'Relocate',
                             iconCls: 'menu-featureoptions-relocate',
+                            disabled: !G.user.isAdmin,
                             handler: function(item) {
                                 G.vars.relocate.active = true;
                                 G.vars.relocate.widget = scope;

=== modified file 'dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/resources/mapfish/widgets/geostat/Point.js'
--- dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/resources/mapfish/widgets/geostat/Point.js	2011-06-22 19:38:25 +0000
+++ dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/resources/mapfish/widgets/geostat/Point.js	2011-06-23 17:18:32 +0000
@@ -1217,6 +1217,7 @@
                         {
                             text: 'Relocate',
                             iconCls: 'menu-featureoptions-relocate',
+                            disabled: !G.user.isAdmin,
                             handler: function(item) {
                                 G.vars.relocate.active = true;
                                 G.vars.relocate.widget = scope;

=== modified file 'dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/resources/mapfish/widgets/geostat/Symbol.js'
--- dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/resources/mapfish/widgets/geostat/Symbol.js	2011-06-22 06:24:33 +0000
+++ dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/resources/mapfish/widgets/geostat/Symbol.js	2011-06-23 17:18:32 +0000
@@ -687,6 +687,7 @@
                         {
                             text: 'Relocate',
                             iconCls: 'menu-featureoptions-relocate',
+                            disabled: !G.user.isAdmin,
                             handler: function(item) {
                                 G.vars.relocate.active = true;
                                 G.vars.relocate.widget = scope;