diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb index aa06fcaf5..f21667b0f 100644 --- a/app/controllers/application_controller.rb +++ b/app/controllers/application_controller.rb @@ -329,7 +329,7 @@ class ApplicationController < ActionController::Base def current_user # User.current if Rails.env.development? - user_id = 36390 + user_id = 50207 else user_id = 130328 end diff --git a/public/react/src/forge/Main/CoderRootBranch.js b/public/react/src/forge/Main/CoderRootBranch.js index 79c75e85e..baa51d71d 100644 --- a/public/react/src/forge/Main/CoderRootBranch.js +++ b/public/react/src/forge/Main/CoderRootBranch.js @@ -15,6 +15,7 @@ class CoderRootBranch extends Component { render(){ const { branchList, projectDetail } = this.props; + const { projectsId } = this.props.match.params; const list =()=>{ if(branchList && branchList.length>0){ return( @@ -24,7 +25,7 @@ class CoderRootBranch extends Component { return(
  • - {item.name} + {item.name} {/*{item.name}*/}

    {item.last_commit && item.last_commit.id} diff --git a/public/react/src/forge/Main/CoderRootCommit.js b/public/react/src/forge/Main/CoderRootCommit.js index 8aedb4451..bea5229c3 100644 --- a/public/react/src/forge/Main/CoderRootCommit.js +++ b/public/react/src/forge/Main/CoderRootCommit.js @@ -19,11 +19,21 @@ class CoderRootCommit extends Component{ } componentDidMount=()=>{ + console.log(this.props); + let { search } = this.props.history.location; + let branchName = undefined; + if(search && search.indexOf("branch")>-1){ + branchName = search.split("=")[1]; + console.log(branchName); + this.setState({ + branch:branchName + }) + } const { branch , page , limit } = this.state; this.setState({ isSpin:true }) - this.getCommitList(branch , page , limit); + this.getCommitList( branchName || branch , page , limit ); } getCommitList=(branch , page , limit)=>{