Fixes grid columns not being set properly when the first query/find e…

…xecuted.
tmcgee · Apr 1, 2016 · 36fadd7 · 36fadd7
1 parent 9ac78e5
commit 36fadd7
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 2 deletions.
diff --git a/widgets/AttributesTable/Table.js b/widgets/AttributesTable/Table.js
@@ -112,13 +112,22 @@ define([
             this.createGrid();
             this.setToolbarButtons();
 
+            var options = {
+                queryOptions: this.queryOptions,
+                findOptions: this.findOptions,
+                gridOptions: this.gridOptions,
+                featureOptions: this.featureOptions,
+                symbolOptions: this.symbolOptions,
+                toolbarOptions: this.toolbarOptions
+            };
+
             if (this.queryParameters && (this.queryParameters.url || this.queryParameters.layerID)) {
                 this.own(aspect.after(this, 'startup', lang.hitch(this, function () {
-                    this.executeQueryTask();
+                    this.executeQueryTask(options);
                 })));
             } else if (this.findOptions && this.findOptions.url) {
                 this.own(aspect.after(this, 'startup', lang.hitch(this, function () {
-                    this.executeFindTask();
+                    this.executeFindTask(options);
                 })));
             }
         },

diff --git a/widgets/AttributesTable/_FindTaskMixin.js b/widgets/AttributesTable/_FindTaskMixin.js
@@ -39,6 +39,7 @@ define([
         },
 
         executeFindTask: function (options) {
+            this.getConfiguration(options);
             if (this.executingQuery === true) {
                 return;
             }

diff --git a/widgets/AttributesTable/_QueryTaskMixin.js b/widgets/AttributesTable/_QueryTaskMixin.js
@@ -114,6 +114,7 @@ define([
         },
 
         executeQueryTask: function (options) {
+            this.getConfiguration(options);
             if (this.executingQuery === true) {
                 return;
             }