From 221cf4fa811ca54fdb50075c5dee4d910faa20fa Mon Sep 17 00:00:00 2001 From: "sylor_huang@126.com" Date: Thu, 2 Jul 2020 14:13:04 +0800 Subject: [PATCH] change user permission --- src/forge/Merge/merge_form.js | 8 +++++++ src/forge/New/Index.js | 35 +++++++++++++++++++----------- src/forge/Order/newMilepost.js | 11 ++++++++++ src/forge/Order/order_form.js | 8 +++++++ src/forge/Settings/Collaborator.js | 9 ++++++++ src/forge/Settings/Setting.js | 8 +++++++ src/forge/Settings/new_tags.js | 8 +++++++ 7 files changed, 74 insertions(+), 13 deletions(-) diff --git a/src/forge/Merge/merge_form.js b/src/forge/Merge/merge_form.js index 69f4863b..d98d15df 100644 --- a/src/forge/Merge/merge_form.js +++ b/src/forge/Merge/merge_form.js @@ -29,9 +29,17 @@ class MergeForm extends Component { } componentDidMount = () => { + this.check_is_login(); this.get_default_selects(); this.set_defatul(); }; + check_is_login =() =>{ + const { current_user } = this.props; + if(!current_user){ + this.props.history.push("/403") + return + } + }; get_default_selects = () => { const { projectsId } = this.props.match.params; this.setState({ isSpin: true }); diff --git a/src/forge/New/Index.js b/src/forge/New/Index.js index ca4e970f..9e293c45 100644 --- a/src/forge/New/Index.js +++ b/src/forge/New/Index.js @@ -41,21 +41,22 @@ class Index extends Component { ignore_name: undefined } } - getUserInfo = () => { - const url = `/users/me.json`; - axios.get(url).then(result => { - if (result && result.data.login) { - this.setState({ - current_user: result.data - }) - this.getDetail(); - } - }).catch(error => { - console.log(error) - }) - } + // getUserInfo = () => { + // const url = `/users/me.json`; + // axios.get(url).then(result => { + // if (result && result.data.login) { + // this.setState({ + // current_user: result.data + // }) + // this.getDetail(); + // } + // }).catch(error => { + // console.log(error) + // }) + // } componentDidMount = () => { // this.getUserInfo(); + this.check_is_login() // 获取项目类别 this.getCategory(); // 获取项目语言 @@ -64,6 +65,14 @@ class Index extends Component { this.getGitignore(); // 获取开源许可证 this.getLicenses(); + + } + check_is_login =() =>{ + const { current_user } = this.props; + if(!current_user){ + this.props.history.push("/403") + return + } } getCategory = () => { const url = `/project_categories.json` diff --git a/src/forge/Order/newMilepost.js b/src/forge/Order/newMilepost.js index 7fca5fae..0a5435a6 100644 --- a/src/forge/Order/newMilepost.js +++ b/src/forge/Order/newMilepost.js @@ -17,6 +17,17 @@ class NewMilepost extends Component { } } + componentDidMount = () => { + this.check_is_login(); + }; + check_is_login =() =>{ + const { current_user } = this.props; + if(!current_user){ + this.props.history.push("/403") + return + } + }; + onPanelChange = (time, mode) => { this.setState({ value: time diff --git a/src/forge/Order/order_form.js b/src/forge/Order/order_form.js index 37386b43..50a8259b 100644 --- a/src/forge/Order/order_form.js +++ b/src/forge/Order/order_form.js @@ -38,9 +38,17 @@ class order_form extends Component { } componentDidMount = () => { + this.check_is_login() this.getSelectList(); this.get_detail(); }; + check_is_login =() =>{ + const { current_user } = this.props; + if(!current_user){ + this.props.history.push("/403") + return + } + } get_detail = () => { const { form_type } = this.props; if (form_type === "new") { diff --git a/src/forge/Settings/Collaborator.js b/src/forge/Settings/Collaborator.js index e1bf408e..638bcd57 100644 --- a/src/forge/Settings/Collaborator.js +++ b/src/forge/Settings/Collaborator.js @@ -56,11 +56,20 @@ class Collaborator extends Component { } componentDidMount = () => { + this.check_is_login() if (this.props.project_id) { this.getMember(); } }; + check_is_login =() =>{ + const { current_user } = this.props; + if(!current_user){ + this.props.history.push("/403") + return + } + }; + componentDidUpdate = (prevState) => { if ( this.props.project_id && diff --git a/src/forge/Settings/Setting.js b/src/forge/Settings/Setting.js index 8d91fed1..4dfa888d 100644 --- a/src/forge/Settings/Setting.js +++ b/src/forge/Settings/Setting.js @@ -19,10 +19,18 @@ class Setting extends Component { } componentDidMount = () => { + this.check_is_login() this.getCategory(); this.getLanguage(); this.getInfo(); }; + check_is_login =() =>{ + const { current_user } = this.props; + if(!current_user){ + this.props.history.push("/403") + return + } + }; getLanguage = () => { const url = `/project_languages.json`; axios diff --git a/src/forge/Settings/new_tags.js b/src/forge/Settings/new_tags.js index 037925f1..1203c990 100644 --- a/src/forge/Settings/new_tags.js +++ b/src/forge/Settings/new_tags.js @@ -51,8 +51,16 @@ class NewTags extends Component { } componentDidMount = () => { + this.check_is_login(); this.getList(); }; + check_is_login =() =>{ + const { current_user } = this.props; + if(!current_user){ + this.props.history.push("/403") + return + } + }; getList = (page, order_name, order_type) => { const { projectsId } = this.props.match.params;