From commits-return-1848-archive-asf-public=cust-asf.ponee.io@superset.incubator.apache.org Fri Nov 16 00:39:00 2018 Return-Path: X-Original-To: archive-asf-public@cust-asf.ponee.io Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by mx-eu-01.ponee.io (Postfix) with SMTP id 0380F180669 for ; Fri, 16 Nov 2018 00:38:59 +0100 (CET) Received: (qmail 21640 invoked by uid 500); 15 Nov 2018 23:38:59 -0000 Mailing-List: contact commits-help@superset.incubator.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@superset.incubator.apache.org Delivered-To: mailing list commits@superset.incubator.apache.org Received: (qmail 21631 invoked by uid 99); 15 Nov 2018 23:38:59 -0000 Received: from ec2-52-202-80-70.compute-1.amazonaws.com (HELO gitbox.apache.org) (52.202.80.70) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 15 Nov 2018 23:38:59 +0000 Received: by gitbox.apache.org (ASF Mail Server at gitbox.apache.org, from userid 33) id 8E9EC87FDE; Thu, 15 Nov 2018 23:38:58 +0000 (UTC) Date: Thu, 15 Nov 2018 23:38:58 +0000 To: "commits@superset.apache.org" Subject: [incubator-superset] branch master updated: Set default limit on creation of new qe and on run (#6400) MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit Message-ID: <154232513811.10710.10656611171371850120@gitbox.apache.org> From: timi@apache.org X-Git-Host: gitbox.apache.org X-Git-Repo: incubator-superset X-Git-Refname: refs/heads/master X-Git-Reftype: branch X-Git-Oldrev: c17de3940cd57c30c5518718433ccd27ba9b0c66 X-Git-Newrev: 8c4f723a6103c0fab0d8a4fff17d14363eb7fbfb X-Git-Rev: 8c4f723a6103c0fab0d8a4fff17d14363eb7fbfb X-Git-NotificationType: ref_changed_plus_diff X-Git-Multimail-Version: 1.5.dev Auto-Submitted: auto-generated 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 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); }