dhis2-devs team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 11687
committer: Lars Helge Øverland <larshelge@xxxxxxxxx>
branch nick: dhis2
timestamp: Sat 2013-08-17 10:50:24 +0200
message:
  PT, fixed wrong js namespaces
modified:
  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/core.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-08-16 19:48:48 +0000
+++ dhis-2/dhis-web/dhis-web-pivot/src/main/webapp/dhis-web-pivot/app/scripts/app.js	2013-08-17 08:50:24 +0000
@@ -3609,7 +3609,7 @@
 		
 		organisationUnit = {
             xtype: 'panel',
-            title: '<div class="dv-panel-title-organisationunit">' + PT.i18n.organisation_units + '</div>',
+            title: '<div class="pt-panel-title-organisationunit">' + PT.i18n.organisation_units + '</div>',
             bodyStyle: 'padding:2px',
             hideCollapseTool: true,
             collapsed: false,

=== modified file 'dhis-2/dhis-web/dhis-web-pivot/src/main/webapp/dhis-web-pivot/app/scripts/core.js'
--- dhis-2/dhis-web/dhis-web-pivot/src/main/webapp/dhis-web-pivot/app/scripts/core.js	2013-08-16 15:10:28 +0000
+++ dhis-2/dhis-web/dhis-web-pivot/src/main/webapp/dhis-web-pivot/app/scripts/core.js	2013-08-17 08:50:24 +0000
@@ -1259,24 +1259,24 @@
 
 									if (isUserOrgunit) {
 										userOu = [{
-											id: dv.init.user.ou,
-											name: response.metaData.names[dv.init.user.ou]
+											id: pt.init.user.ou,
+											name: response.metaData.names[pt.init.user.ou]
 										}];
 									}
 									if (isUserOrgunitChildren) {
 										userOuc = [];
 
-										for (var j = 0; j < dv.init.user.ouc.length; j++) {
+										for (var j = 0; j < pt.init.user.ouc.length; j++) {
 											userOuc.push({
-												id: dv.init.user.ouc[j],
-												name: response.metaData.names[dv.init.user.ouc[j]]
+												id: pt.init.user.ouc[j],
+												name: response.metaData.names[pt.init.user.ouc[j]]
 											});
 										}
 
-										userOuc = dv.util.array.sortObjectsByString(userOuc);
+										userOuc = pt.util.array.sortObjectsByString(userOuc);
 									}
 									if (isUserOrgunitGrandChildren) {
-										var userOuOuc = [].concat(dv.init.user.ou, dv.init.user.ouc),
+										var userOuOuc = [].concat(pt.init.user.ou, pt.init.user.ouc),
 											responseOu = response.metaData.ou;
 
 										userOugc = [];
@@ -1290,7 +1290,7 @@
 											}
 										}
 
-										userOugc = dv.util.array.sortObjectsByString(userOugc);
+										userOugc = pt.util.array.sortObjectsByString(userOugc);
 									}
 
 									dim.items = [].concat(userOu || [], userOuc || [], userOugc || []);
@@ -1305,7 +1305,7 @@
 										});
 									}
 
-									dim.items = dv.util.array.sortObjectsByString(dim.items);
+									dim.items = pt.util.array.sortObjectsByString(dim.items);
 								}
 								else {
 									dim.items = Ext.clone(xLayout.dimensionNameItemsMap[dim.dimensionName]);