Merge pull request #1370 from processing/share-modal-wrong-username
Fixes #1349
This commit is contained in:
commit
4f52c5893d
2 changed files with 13 additions and 7 deletions
|
@ -2,7 +2,7 @@ import PropTypes from 'prop-types';
|
|||
import React from 'react';
|
||||
import { connect } from 'react-redux';
|
||||
import { withRouter } from 'react-router';
|
||||
import { Link, browserHistory } from 'react-router';
|
||||
import { Link } from 'react-router';
|
||||
import InlineSVG from 'react-inlinesvg';
|
||||
import classNames from 'classnames';
|
||||
import * as IDEActions from '../modules/IDE/actions/ide';
|
||||
|
@ -167,8 +167,6 @@ class Nav extends React.PureComponent {
|
|||
|
||||
handleLogout() {
|
||||
this.props.logoutUser();
|
||||
// if you're on the settings page, probably.
|
||||
browserHistory.push('/');
|
||||
this.setDropdown('none');
|
||||
}
|
||||
|
||||
|
@ -184,7 +182,8 @@ class Nav extends React.PureComponent {
|
|||
}
|
||||
|
||||
handleShare() {
|
||||
this.props.showShareModal();
|
||||
const { username } = this.props.params;
|
||||
this.props.showShareModal(this.props.project.id, this.props.project.name, username);
|
||||
this.setDropdown('none');
|
||||
}
|
||||
|
||||
|
@ -717,6 +716,7 @@ Nav.propTypes = {
|
|||
}).isRequired,
|
||||
project: PropTypes.shape({
|
||||
id: PropTypes.string,
|
||||
name: PropTypes.string,
|
||||
owner: PropTypes.shape({
|
||||
id: PropTypes.string
|
||||
})
|
||||
|
@ -742,7 +742,10 @@ Nav.propTypes = {
|
|||
layout: PropTypes.oneOf(['dashboard', 'project']),
|
||||
rootFile: PropTypes.shape({
|
||||
id: PropTypes.string.isRequired
|
||||
}).isRequired
|
||||
}).isRequired,
|
||||
params: PropTypes.shape({
|
||||
username: PropTypes.string
|
||||
})
|
||||
};
|
||||
|
||||
Nav.defaultProps = {
|
||||
|
@ -752,7 +755,10 @@ Nav.defaultProps = {
|
|||
},
|
||||
cmController: {},
|
||||
layout: 'project',
|
||||
warnIfUnsavedChanges: undefined
|
||||
warnIfUnsavedChanges: undefined,
|
||||
params: {
|
||||
username: undefined
|
||||
}
|
||||
};
|
||||
|
||||
function mapStateToProps(state) {
|
||||
|
|
|
@ -312,7 +312,7 @@ SketchListRowBase.propTypes = {
|
|||
cloneProject: PropTypes.func.isRequired,
|
||||
exportProjectAsZip: PropTypes.func.isRequired,
|
||||
changeProjectName: PropTypes.func.isRequired,
|
||||
onAddToCollection: PropTypes.func.isRequired,
|
||||
onAddToCollection: PropTypes.func.isRequired
|
||||
};
|
||||
|
||||
function mapDispatchToPropsSketchListRow(dispatch) {
|
||||
|
|
Loading…
Reference in a new issue