dhis2-devs team mailing list archive

[noreply@xxxxxxxxxxxxx]

Merge authors:
  Jan Henrik Øverland (janhenrik-overland)
------------------------------------------------------------
revno: 5585 [merge]
committer: Jan Henrik Overland <janhenrik.overland@xxxxxxxxx>
branch nick: dhis2
timestamp: Sun 2011-12-25 16:43:03 +0100
message:
  User/system favorites bug fixed.
modified:
  dhis-2/dhis-web/dhis-web-visualizer/src/main/webapp/dhis-web-visualizer/app/app.js
  dhis-2/dhis-web/dhis-web-visualizer/src/main/webapp/dhis-web-visualizer/app/plugin/plugin.html


--
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-visualizer/src/main/webapp/dhis-web-visualizer/app/app.js'
--- dhis-2/dhis-web/dhis-web-visualizer/src/main/webapp/dhis-web-visualizer/app/app.js	2011-12-24 12:01:38 +0000
+++ dhis-2/dhis-web/dhis-web-visualizer/src/main/webapp/dhis-web-visualizer/app/app.js	2011-12-25 15:40:58 +0000
@@ -931,10 +931,7 @@
             listeners: {
                 load: function(s) {
                     s.filterBy(function(r) {
-                        if (r.data.userId == DV.init.system.user.id) {
-                            return true;
-                        }
-                        if (!r.data.userId && DV.init.system.user.isAdmin) {
+                        if (!r.data.userId || r.data.userId == DV.init.system.user.id) {
                             return true;
                         }
                         return false;

=== modified file 'dhis-2/dhis-web/dhis-web-visualizer/src/main/webapp/dhis-web-visualizer/app/plugin/plugin.html'
--- dhis-2/dhis-web/dhis-web-visualizer/src/main/webapp/dhis-web-visualizer/app/plugin/plugin.html	2011-12-21 23:12:40 +0000
+++ dhis-2/dhis-web/dhis-web-visualizer/src/main/webapp/dhis-web-visualizer/app/plugin/plugin.html	2011-12-25 15:40:58 +0000
@@ -41,14 +41,15 @@
 */
 			
 			DHIS.getChart({
-                indicators: [31664, 32414],
+                type: 'stackedcolumn',
+                indicators: [52486, 52491],
 				organisationunits: [18],
 				el: 'chart1',
 				url: url
 			});
             
             DHIS.getChart({
-                uid: 'En9nUMN7WjT',
+                uid: 'UlfTKWZWV4u',
                 el: 'chart2',
                 url: url
             });