superset-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From maximebeauche...@apache.org
Subject [incubator-superset] branch master updated: [bug fix] Fix to #3137 and #3239 (#3240)
Date Fri, 04 Aug 2017 16:05:52 GMT
This is an automated email from the ASF dual-hosted git repository.

maximebeauchemin 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 2ef9bfe  [bug fix] Fix to #3137 and #3239 (#3240)
2ef9bfe is described below

commit 2ef9bfed2057144e33cf36c9447337742bab677f
Author: Shao-Yen "Fred" Cheng <hses83081@gmail.com>
AuthorDate: Fri Aug 4 09:05:50 2017 -0700

    [bug fix] Fix to #3137 and #3239 (#3240)
    
    * #3137 add the leftover code from #3138 for fixing issue #3137
    
    * #3239 Use slice id as the key instead of sliceName
---
 superset/assets/javascripts/dashboard/components/SliceAdder.jsx    | 7 ++++++-
 .../javascripts/explore/components/ControlPanelsContainer.jsx      | 1 +
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/superset/assets/javascripts/dashboard/components/SliceAdder.jsx b/superset/assets/javascripts/dashboard/components/SliceAdder.jsx
index a96effe..cb92066 100644
--- a/superset/assets/javascripts/dashboard/components/SliceAdder.jsx
+++ b/superset/assets/javascripts/dashboard/components/SliceAdder.jsx
@@ -129,9 +129,14 @@ class SliceAdder extends React.Component {
             height="auto"
           >
             <TableHeaderColumn
-              dataField="sliceName"
+              dataField="id"
               isKey
               dataSort
+              hidden
+            />
+            <TableHeaderColumn
+              dataField="sliceName"
+              dataSort
             >
               Name
             </TableHeaderColumn>
diff --git a/superset/assets/javascripts/explore/components/ControlPanelsContainer.jsx b/superset/assets/javascripts/explore/components/ControlPanelsContainer.jsx
index 8a2e528..e3b2985 100644
--- a/superset/assets/javascripts/explore/components/ControlPanelsContainer.jsx
+++ b/superset/assets/javascripts/explore/components/ControlPanelsContainer.jsx
@@ -74,6 +74,7 @@ class ControlPanelsContainer extends React.Component {
                   key={`controlsetrow-${i}`}
                   controls={controlSets.map(controlName => (
                     controlName &&
+                    this.props.controls[controlName] &&
                       <Control
                         name={controlName}
                         key={`control-${controlName}`}

-- 
To stop receiving notification emails like this one, please contact
['"commits@superset.apache.org" <commits@superset.apache.org>'].

Mime
View raw message