go to /api/:id/dropdown while editing a query, since dropdown queries…

… might still not be associated with the parent. see #3711
getredash · Apr 17, 2019 · bc48a23 · bc48a23
1 parent 5a782cb
commit bc48a23
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/client/app/components/QueryBasedParameterInput.jsx b/client/app/components/QueryBasedParameterInput.jsx
@@ -47,7 +47,7 @@ export class QueryBasedParameterInput extends React.Component {
   async _loadOptions(queryId) {
     if (queryId && (queryId !== this.state.queryId)) {
       this.setState({ loading: true });
-      const options = await this.props.parameter.loadDropdownValues();
+      const options = await this.props.parameter.loadDropdownValues(this.props.isDirty);
 
       // stale queryId check
       if (this.props.queryId === queryId) {

diff --git a/client/app/services/query.js b/client/app/services/query.js
@@ -202,8 +202,8 @@ export class Parameter {
     return `{{ ${this.name} }}`;
   }
 
-  loadDropdownValues() {
-    if (this.parentQueryId) {
+  loadDropdownValues(isDirty) {
+    if (this.parentQueryId && !isDirty) {
       return Query.associatedDropdown({ queryId: this.parentQueryId, dropdownQueryId: this.queryId }).$promise;
     }