diff --git a/src/App.js b/src/App.js index 5105d3ec7..a73c04d45 100644 --- a/src/App.js +++ b/src/App.js @@ -78,6 +78,10 @@ const Search = Loadable({ loading: Loading, }) +const ProjectIndex = Loadable({ + loader: () => import("./forge/Main/Index"), + loading: Loading, +}); class App extends Component { constructor(props) { super(props); @@ -103,30 +107,9 @@ class App extends Component { Addcoursestypes: false }) }; - ModalCancelsy = () => { - this.setState({ - mydisplay: false, - }) - window.location.href = "/"; - }; - ModalshowCancelsy = () => { - this.setState({ - mydisplay: true, - }) - }; - disableVideoContextMenu = () => { - window.$("body").on("mousedown", "video", function (event) { - if (event.which === 3) { - window.$('video').bind('contextmenu', function () { return false; }); - } else { - window.$('video').unbind('contextmenu'); - } - }); - } componentDidMount() { document.title = "loading..."; - this.disableVideoContextMenu(); initAxiosInterceptors(this.props); this.getAppdata(); @@ -204,6 +187,8 @@ class App extends Component { }; render() { + const { mygetHelmetapi } = this.state; + let personal = mygetHelmetapi && mygetHelmetapi.personal; return ( @@ -265,7 +250,10 @@ class App extends Component { ( - + personal && personal.length > 0 ? + + : + ) } /> diff --git a/src/forge/Index.js b/src/forge/Index.js index 533530b0e..af4d44438 100644 --- a/src/forge/Index.js +++ b/src/forge/Index.js @@ -26,10 +26,6 @@ const ProjectDetail = Loadable({ loading: Loading, }); -const Infos = Loadable({ - loader: () => import("./users/Infos"), - loading: Loading, -}); class Index extends Component { componentDidUpdate=()=>{ @@ -73,16 +69,6 @@ class Index extends Component { )} > - ( - this.props.current_user && this.props.current_user.login ? - - : - - )} - > ); diff --git a/src/forge/New/Index.js b/src/forge/New/Index.js index 381d74382..c2e2afc00 100644 --- a/src/forge/New/Index.js +++ b/src/forge/New/Index.js @@ -68,24 +68,30 @@ class Index extends Component { getOwner=()=>{ const { OIdentifier } = this.props.match.params; + const { user_id } = this.props && this.props.current_user; const url = `/owners.json`; axios.get(url).then(result=>{ if(result && result.data){ let owner = result.data.owners; + this.setState({ + OwnerList: owner, + }) if(OIdentifier){ owner = owner.filter(item=>item.name === OIdentifier); this.props.form.setFieldsValue({ user_id:OIdentifier }) - owner && this.setState({ - owners_id:owner[0].id, - owners_name:owner[0].name + }else if(user_id){ + owner = owner.filter(item=>item.id === user_id); + this.props.form.setFieldsValue({ + user_id:owner && owner[0].name }) } - this.setOptionsList(owner, 'owners'); - this.setState({ - OwnerList: owner, + owner && this.setState({ + owners_id:owner[0].id, + owners_name:owner[0].name }) + this.setOptionsList(owner, 'owners'); } }).catch(error=>{}) }