Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[bug fix] Fix to #3137 and #3239 #3240

Merged
merged 3 commits into from
Aug 4, 2017
Merged

[bug fix] Fix to #3137 and #3239 #3240

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
8c062c0
Merge pull request #2 from apache/master
FrederichCheng Aug 3, 2017
de6026d
#3137 add the leftover code from #3138 for fixing issue #3137
scheng-hds Aug 3, 2017
0fb618f
#3239 Use slice id as the key instead of sliceName
scheng-hds Aug 4, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 6 additions & 1 deletion superset/assets/javascripts/dashboard/components/SliceAdder.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
1 change: 1 addition & 0 deletions superset/assets/javascripts/explore/components/ControlPanelsContainer.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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}`}
Expand Down