[incubator-superset] branch master updated: Set default limit on creation of new qe and on run (#6400)

[ti...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

timi pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-superset.git


The following commit(s) were added to refs/heads/master by this push:
     new 8c4f723  Set default limit on creation of new qe and on run (#6400)
8c4f723 is described below

commit 8c4f723a6103c0fab0d8a4fff17d14363eb7fbfb
Author: Jeffrey Wang <je...@gmail.com>
AuthorDate: Thu Nov 15 18:38:51 2018 -0500

    Set default limit on creation of new qe and on run (#6400)
---
 superset/assets/src/SqlLab/components/SqlEditor.jsx        | 2 +-
 superset/assets/src/SqlLab/components/TabbedSqlEditors.jsx | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/superset/assets/src/SqlLab/components/SqlEditor.jsx b/superset/assets/src/SqlLab/components/SqlEditor.jsx
index 7a38770..63889ad 100644
--- a/superset/assets/src/SqlLab/components/SqlEditor.jsx
+++ b/superset/assets/src/SqlLab/components/SqlEditor.jsx
@@ -149,7 +149,7 @@ class SqlEditor extends React.PureComponent {
       schema: qe.schema,
       tempTableName: ctas ? this.state.ctas : '',
       templateParams: qe.templateParams,
-      queryLimit: qe.queryLimit,
+      queryLimit: qe.queryLimit || this.props.defaultQueryLimit,
       runAsync,
       ctas,
     };
diff --git a/superset/assets/src/SqlLab/components/TabbedSqlEditors.jsx b/superset/assets/src/SqlLab/components/TabbedSqlEditors.jsx
index 7407dcb..da0d9d1 100644
--- a/superset/assets/src/SqlLab/components/TabbedSqlEditors.jsx
+++ b/superset/assets/src/SqlLab/components/TabbedSqlEditors.jsx
@@ -138,6 +138,7 @@ class TabbedSqlEditors extends React.PureComponent {
       sql: `${t(
         '-- Note: Unless you save your query, these tabs will NOT persist if you clear your cookies or change browsers.',
       )}\n\nSELECT ...`,
+      queryLimit: this.props.defaultQueryLimit,
     };
     this.props.actions.addQueryEditor(qe);
   }