=== 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 2014-01-02 19:49:41 +0000
+++ dhis-2/dhis-web/dhis-web-pivot/src/main/webapp/dhis-web-pivot/app/scripts/app.js 2014-01-03 16:26:42 +0000
@@ -4798,11 +4798,31 @@
handler: function() {
var textArea,
window,
- text = 'DHIS.getTable(' + JSON.stringify(ns.core.service.layout.layout2plugin(ns.app.layout)) + ');';
+ text = '';
+
+ text += '\n\n\n\n';
+ text += '\n';
+ text += '\n';
+ text += '\n\n';
+ text += '\n\n\n\n';
+ text += ' \n';
+ text += '\n';
textArea = Ext.create('Ext.form.field.TextArea', {
- width: 400,
- height: 200,
+ width: 700,
+ height: 400,
readOnly: true,
cls: 'ns-textarea monospaced',
value: text
@@ -4818,12 +4838,6 @@
bbar: [
'->',
{
- text: 'Format',
- handler: function() {
- textArea.setValue('DHIS.getTable(' + JSON.stringify(ns.core.service.layout.layout2plugin(ns.app.layout), null, 2) + ');');
- }
- },
- {
text: 'Select',
handler: function() {
textArea.selectText();
=== 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 2014-01-02 19:49:41 +0000
+++ dhis-2/dhis-web/dhis-web-pivot/src/main/webapp/dhis-web-pivot/app/scripts/core.js 2014-01-03 16:26:42 +0000
@@ -1517,12 +1517,16 @@
return layout.showHierarchy && Ext.isObject(response.metaData.ouHierarchy) && response.metaData.ouHierarchy.hasOwnProperty(id);
};
- service.layout.layout2plugin = function(layout) {
+ service.layout.layout2plugin = function(layout, el) {
var layout = Ext.clone(layout),
dimensions = Ext.Array.clean([].concat(layout.columns || [], layout.rows || [], layout.filters || []));
layout.url = init.contextPath;
+ if (el) {
+ layout.el = el;
+ }
+
if (Ext.isString(layout.id)) {
return {id: layout.id};
}
@@ -1543,6 +1547,7 @@
delete item.code;
delete item.created;
delete item.lastUpdated;
+ delete item.value;
}
}