Skip to content

Commit

Permalink
merge
Browse files Browse the repository at this point in the history
  • Loading branch information
@lxzhangchao
lxzhangchao committed Jul 19, 2017
1 parent 6d718a3 commit 0cd0139
Show file tree
Hide file tree
Showing 8 changed files with 65 additions and 78 deletions.
26 changes: 13 additions & 13 deletions babel/messages.pot
View file
Original file line number Diff line number Diff line change
Expand Up @@ -916,55 +916,55 @@ msgstr ""
msgid "Saved Queries"
msgstr ""

#: superset/assets/javascripts/explore/components/SaveModal.jsx:75
#: superset/assets/javascripts/explore/components/SaveModal.jsx:73
msgid "Please enter a slice name"
msgstr ""

#: superset/assets/javascripts/explore/components/SaveModal.jsx:90
#: superset/assets/javascripts/explore/components/SaveModal.jsx:88
msgid "Please select a dashboard"
msgstr ""

#: superset/assets/javascripts/explore/components/SaveModal.jsx:98
#: superset/assets/javascripts/explore/components/SaveModal.jsx:96
msgid "Please enter a dashboard name"
msgstr ""

#: superset/assets/javascripts/explore/components/SaveModal.jsx:136
#: superset/assets/javascripts/explore/components/SaveModal.jsx:134
msgid "Save A Slice"
msgstr ""

#: superset/assets/javascripts/explore/components/SaveModal.jsx:157
#: superset/assets/javascripts/explore/components/SaveModal.jsx:155
msgid "Overwrite slice"
msgstr ""

#: superset/assets/javascripts/explore/components/SaveModal.jsx:166
#: superset/assets/javascripts/explore/components/SaveModal.jsx:164
msgid "Save as"
msgstr ""

#: superset/assets/javascripts/explore/components/SaveModal.jsx:170
#: superset/assets/javascripts/explore/components/SaveModal.jsx:168
msgid "[slice name]"
msgstr ""

#: superset/assets/javascripts/explore/components/SaveModal.jsx:183
#: superset/assets/javascripts/explore/components/SaveModal.jsx:181
msgid "Do not add to a dashboard"
msgstr ""

#: superset/assets/javascripts/explore/components/SaveModal.jsx:191
#: superset/assets/javascripts/explore/components/SaveModal.jsx:189
msgid "Add slice to existing dashboard"
msgstr ""

#: superset/assets/javascripts/explore/components/SaveModal.jsx:205
#: superset/assets/javascripts/explore/components/SaveModal.jsx:203
msgid "Add to new dashboard"
msgstr ""

#: superset/assets/javascripts/explore/components/SaveModal.jsx:210
#: superset/assets/javascripts/explore/components/SaveModal.jsx:208
msgid "[dashboard name]"
msgstr ""

#: superset/assets/javascripts/explore/components/SaveModal.jsx:222
#: superset/assets/javascripts/explore/components/SaveModal.jsx:220
msgid "Save"
msgstr ""

#: superset/assets/javascripts/explore/components/SaveModal.jsx:231
#: superset/assets/javascripts/explore/components/SaveModal.jsx:229
msgid "Save & go to dashboard"
msgstr ""

2 changes: 0 additions & 2 deletions superset/assets/javascripts/explore/components/SaveModal.jsx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,6 @@ class SaveModal extends React.Component {
componentDidMount() {
this.props.actions.fetchDashboards(this.props.user_id);
}

onChange(name, event) {
switch (name) {
case 'newSliceName':
Expand All @@ -52,7 +51,6 @@ class SaveModal extends React.Component {
break;
}
}

changeAction(action) {
this.setState({ action });
}
Expand Down
7 changes: 0 additions & 7 deletions superset/assets/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,6 @@
},
"homepage": "https://github.com/airbnb/superset#readme",
"dependencies": {
"babel-gettext-extractor": "^2.0.0",
"babel-register": "^6.24.1",
"bootstrap": "^3.3.6",
"brace": "^0.10.0",
Expand All @@ -53,18 +52,14 @@
"datatables-bootstrap3-plugin": "^0.5.0",
"datatables.net": "^1.10.13",
"datatables.net-bs": "^1.10.12",
"eslint-plugin-getsentry": "^2.0.0",
"fs": "0.0.1-security",
"immutable": "^3.8.1",
"intl": "^1.2.5",
"jed": "^1.1.1",
"jquery": "^3.2.1",
"jsdom": "9.12.0",
"lodash.throttle": "^4.1.1",
"mapbox-gl": "^0.26.0",
"moment": "^2.14.1",
"mustache": "^2.2.1",
"node-gettext": "^2.0.0",
"nvd3": "1.8.5",
"po-catalog-loader": "^1.2.0",
"prop-types": "^15.5.8",
Expand All @@ -78,8 +73,6 @@
"react-dom": "^15.5.1",
"react-gravatar": "^2.6.1",
"react-grid-layout": "^0.14.4",
"react-intl": "^2.3.0",
"react-intl-universal": "^1.1.1",
"react-map-gl": "^1.7.0",
"react-redux": "^5.0.2",
"react-resizable": "^1.3.3",
Expand Down
4 changes: 0 additions & 4 deletions superset/security.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -166,12 +166,8 @@ def create_missing_perms():
"Fetching a set of all perms to lookup which ones are missing")
all_pvs = set()
for pv in sm.get_session.query(sm.permissionview_model).all():
<<<<<<< HEAD
all_pvs.add((pv.permission.name, pv.view_menu.name))
=======
if pv.permission and pv.view_menu:
all_pvs.add((pv.permission.name, pv.view_menu.name))
>>>>>>> upstream/master

def merge_pv(view_menu, perm):
"""Create permission view menu only if it doesn't exist"""
Expand Down
26 changes: 13 additions & 13 deletions superset/translations/es/LC_MESSAGES/messages.po
View file
Original file line number Diff line number Diff line change
Expand Up @@ -917,55 +917,55 @@ msgstr ""
msgid "Saved Queries"
msgstr ""

#: superset/assets/javascripts/explore/components/SaveModal.jsx:75
#: superset/assets/javascripts/explore/components/SaveModal.jsx:73
msgid "Please enter a slice name"
msgstr ""

#: superset/assets/javascripts/explore/components/SaveModal.jsx:90
#: superset/assets/javascripts/explore/components/SaveModal.jsx:88
msgid "Please select a dashboard"
msgstr ""

#: superset/assets/javascripts/explore/components/SaveModal.jsx:98
#: superset/assets/javascripts/explore/components/SaveModal.jsx:96
msgid "Please enter a dashboard name"
msgstr ""

#: superset/assets/javascripts/explore/components/SaveModal.jsx:136
#: superset/assets/javascripts/explore/components/SaveModal.jsx:134
msgid "Save A Slice"
msgstr ""

#: superset/assets/javascripts/explore/components/SaveModal.jsx:157
#: superset/assets/javascripts/explore/components/SaveModal.jsx:155
msgid "Overwrite slice"
msgstr ""

#: superset/assets/javascripts/explore/components/SaveModal.jsx:166
#: superset/assets/javascripts/explore/components/SaveModal.jsx:164
msgid "Save as"
msgstr ""

#: superset/assets/javascripts/explore/components/SaveModal.jsx:170
#: superset/assets/javascripts/explore/components/SaveModal.jsx:168
msgid "[slice name]"
msgstr ""

#: superset/assets/javascripts/explore/components/SaveModal.jsx:183
#: superset/assets/javascripts/explore/components/SaveModal.jsx:181
msgid "Do not add to a dashboard"
msgstr ""

#: superset/assets/javascripts/explore/components/SaveModal.jsx:191
#: superset/assets/javascripts/explore/components/SaveModal.jsx:189
msgid "Add slice to existing dashboard"
msgstr ""

#: superset/assets/javascripts/explore/components/SaveModal.jsx:205
#: superset/assets/javascripts/explore/components/SaveModal.jsx:203
msgid "Add to new dashboard"
msgstr ""

#: superset/assets/javascripts/explore/components/SaveModal.jsx:210
#: superset/assets/javascripts/explore/components/SaveModal.jsx:208
msgid "[dashboard name]"
msgstr ""

#: superset/assets/javascripts/explore/components/SaveModal.jsx:222
#: superset/assets/javascripts/explore/components/SaveModal.jsx:220
msgid "Save"
msgstr ""

#: superset/assets/javascripts/explore/components/SaveModal.jsx:231
#: superset/assets/javascripts/explore/components/SaveModal.jsx:229
msgid "Save & go to dashboard"
msgstr ""

Expand Down
26 changes: 13 additions & 13 deletions superset/translations/fr/LC_MESSAGES/messages.po
View file
Original file line number Diff line number Diff line change
Expand Up @@ -917,55 +917,55 @@ msgstr ""
msgid "Saved Queries"
msgstr ""

#: superset/assets/javascripts/explore/components/SaveModal.jsx:75
#: superset/assets/javascripts/explore/components/SaveModal.jsx:73
msgid "Please enter a slice name"
msgstr ""

#: superset/assets/javascripts/explore/components/SaveModal.jsx:90
#: superset/assets/javascripts/explore/components/SaveModal.jsx:88
msgid "Please select a dashboard"
msgstr ""

#: superset/assets/javascripts/explore/components/SaveModal.jsx:98
#: superset/assets/javascripts/explore/components/SaveModal.jsx:96
msgid "Please enter a dashboard name"
msgstr ""

#: superset/assets/javascripts/explore/components/SaveModal.jsx:136
#: superset/assets/javascripts/explore/components/SaveModal.jsx:134
msgid "Save A Slice"
msgstr ""

#: superset/assets/javascripts/explore/components/SaveModal.jsx:157
#: superset/assets/javascripts/explore/components/SaveModal.jsx:155
msgid "Overwrite slice"
msgstr ""

#: superset/assets/javascripts/explore/components/SaveModal.jsx:166
#: superset/assets/javascripts/explore/components/SaveModal.jsx:164
msgid "Save as"
msgstr ""

#: superset/assets/javascripts/explore/components/SaveModal.jsx:170
#: superset/assets/javascripts/explore/components/SaveModal.jsx:168
msgid "[slice name]"
msgstr ""

#: superset/assets/javascripts/explore/components/SaveModal.jsx:183
#: superset/assets/javascripts/explore/components/SaveModal.jsx:181
msgid "Do not add to a dashboard"
msgstr ""

#: superset/assets/javascripts/explore/components/SaveModal.jsx:191
#: superset/assets/javascripts/explore/components/SaveModal.jsx:189
msgid "Add slice to existing dashboard"
msgstr ""

#: superset/assets/javascripts/explore/components/SaveModal.jsx:205
#: superset/assets/javascripts/explore/components/SaveModal.jsx:203
msgid "Add to new dashboard"
msgstr ""

#: superset/assets/javascripts/explore/components/SaveModal.jsx:210
#: superset/assets/javascripts/explore/components/SaveModal.jsx:208
msgid "[dashboard name]"
msgstr ""

#: superset/assets/javascripts/explore/components/SaveModal.jsx:222
#: superset/assets/javascripts/explore/components/SaveModal.jsx:220
msgid "Save"
msgstr ""

#: superset/assets/javascripts/explore/components/SaveModal.jsx:231
#: superset/assets/javascripts/explore/components/SaveModal.jsx:229
msgid "Save & go to dashboard"
msgstr ""

Expand Down
26 changes: 13 additions & 13 deletions superset/translations/it/LC_MESSAGES/messages.po
View file
Original file line number Diff line number Diff line change
Expand Up @@ -981,55 +981,55 @@ msgstr ""
msgid "Saved Queries"
msgstr ""

#: superset/assets/javascripts/explore/components/SaveModal.jsx:75
#: superset/assets/javascripts/explore/components/SaveModal.jsx:73
msgid "Please enter a slice name"
msgstr ""

#: superset/assets/javascripts/explore/components/SaveModal.jsx:90
#: superset/assets/javascripts/explore/components/SaveModal.jsx:88
msgid "Please select a dashboard"
msgstr ""

#: superset/assets/javascripts/explore/components/SaveModal.jsx:98
#: superset/assets/javascripts/explore/components/SaveModal.jsx:96
msgid "Please enter a dashboard name"
msgstr ""

#: superset/assets/javascripts/explore/components/SaveModal.jsx:136
#: superset/assets/javascripts/explore/components/SaveModal.jsx:134
msgid "Save A Slice"
msgstr ""

#: superset/assets/javascripts/explore/components/SaveModal.jsx:157
#: superset/assets/javascripts/explore/components/SaveModal.jsx:155
msgid "Overwrite slice"
msgstr ""

#: superset/assets/javascripts/explore/components/SaveModal.jsx:166
#: superset/assets/javascripts/explore/components/SaveModal.jsx:164
msgid "Save as"
msgstr ""

#: superset/assets/javascripts/explore/components/SaveModal.jsx:170
#: superset/assets/javascripts/explore/components/SaveModal.jsx:168
msgid "[slice name]"
msgstr ""

#: superset/assets/javascripts/explore/components/SaveModal.jsx:183
#: superset/assets/javascripts/explore/components/SaveModal.jsx:181
msgid "Do not add to a dashboard"
msgstr ""

#: superset/assets/javascripts/explore/components/SaveModal.jsx:191
#: superset/assets/javascripts/explore/components/SaveModal.jsx:189
msgid "Add slice to existing dashboard"
msgstr ""

#: superset/assets/javascripts/explore/components/SaveModal.jsx:205
#: superset/assets/javascripts/explore/components/SaveModal.jsx:203
msgid "Add to new dashboard"
msgstr ""

#: superset/assets/javascripts/explore/components/SaveModal.jsx:210
#: superset/assets/javascripts/explore/components/SaveModal.jsx:208
msgid "[dashboard name]"
msgstr ""

#: superset/assets/javascripts/explore/components/SaveModal.jsx:222
#: superset/assets/javascripts/explore/components/SaveModal.jsx:220
msgid "Save"
msgstr ""

#: superset/assets/javascripts/explore/components/SaveModal.jsx:231
#: superset/assets/javascripts/explore/components/SaveModal.jsx:229
msgid "Save & go to dashboard"
msgstr ""

Loading

0 comments on commit 0cd0139

Please sign in to comment.