[Lada-commits] [PATCH] merged

[Wald Commits]

# HG changeset patch
# User Raimund Renkert <raimund.renkert at intevation.de>
# Date 1418814640 -3600
# Node ID 6301d3210a9fffbe25e020fcdb195fc8e9aa29a4
# Parent  91a1a88ee3538f0ef1092a1b91f1469efa45b14a
# Parent  8b4ec83ddca316f0eb2d99153c6a6ad27d409eb7
merged.

diff -r 91a1a88ee353 -r 6301d3210a9f app/controller/Sql.js
--- a/app/controller/Sql.js	Wed Dec 17 12:08:29 2014 +0100
+++ b/app/controller/Sql.js	Wed Dec 17 12:10:40 2014 +0100
@@ -59,7 +59,7 @@
     selectSql: function(element, record) {
         var result = Ext.getCmp('result');
         var filters = Ext.getCmp('queryfilters');
-        //var sqlquery = Ext.getCmp('sqlquery');
+        var columns = Ext.getCmp('results');
         var sqldesc = Ext.getCmp('sqldesc');
         var buttons = Ext.getCmp('SearchBtnPanel');
         var displayFields = record[0].data.results;
@@ -67,7 +67,11 @@
 
         this.reset();
 
-        //sqlquery.setValue(record[0].data.sql);
+        columnString = [];
+        for (var i = 0; i < displayFields.length; i++) {
+            columnString.push(displayFields[i].header);
+        }
+        columns.setValue(columnString.join(', '));
         sqldesc.setValue(record[0].data.description);
 
         // Setup Columns of the probenlist
diff -r 91a1a88ee353 -r 6301d3210a9f app/view/search/List.js
--- a/app/view/search/List.js	Wed Dec 17 12:08:29 2014 +0100
+++ b/app/view/search/List.js	Wed Dec 17 12:10:40 2014 +0100
@@ -60,9 +60,9 @@
                 shrinkWrap: 3,
                 value: '-/-'
             }, {
-                id: 'sqlquery',
+                id: 'results',
                 xtype: 'displayfield',
-                fieldLabel: 'Abfrage',
+                fieldLabel: 'Spalten',
                 value: '-/-'
             }]
         }];