dhis2-devs team mailing list archive

[noreply@xxxxxxxxxxxxx]

Merge authors:
  Jan Henrik Øverland (janhenrik-overland)
------------------------------------------------------------
revno: 11419 [merge]
committer: Jan Henrik Overland <janhenrik.overland@xxxxxxxxx>
branch nick: dhis2
timestamp: Wed 2013-07-17 15:46:57 +0200
message:
  (PT, DV) Url bug fixed.
modified:
  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-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-07-17 10:15:12 +0000
+++ dhis-2/dhis-web/dhis-web-pivot/src/main/webapp/dhis-web-pivot/app/scripts/app.js	2013-07-17 13:46:09 +0000
@@ -4225,7 +4225,7 @@
                                             disabled: !PT.isSessionStorage || !pt.layout,
                                             handler: function() {
                                                 if (PT.isSessionStorage) {
-                                                    pt.util.pivot.setSessionStorage(pt.layout, 'analytical', '/dhis-web-visualizer/app/index.html?s=analytical');
+                                                    pt.util.pivot.setSessionStorage(pt.layout, 'analytical', pt.baseUrl + '/dhis-web-visualizer/app/index.html?s=analytical');
                                                 }
                                             }
                                         },

=== 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-07-17 10:21:14 +0000
+++ dhis-2/dhis-web/dhis-web-visualizer/src/main/webapp/dhis-web-visualizer/app/scripts/app.js	2013-07-17 13:46:09 +0000
@@ -4371,7 +4371,7 @@
                                             disabled: !DV.isSessionStorage || !dv.layout,
                                             handler: function() {
                                                 if (DV.isSessionStorage) {
-                                                    dv.util.chart.setSessionStorage(dv.layout, 'analytical', '/dhis-web-pivot/app/index.html?s=analytical');
+                                                    dv.util.chart.setSessionStorage(dv.layout, 'analytical', dv.baseUrl + '/dhis-web-pivot/app/index.html?s=analytical');
                                                 }
                                             }
                                         },