Merge branch 'develop' of http://git.trustie.net/jasder/forgeplus-react into develop

This commit is contained in:
sylor_huang@126.com 2020-04-26 09:19:12 +08:00
commit f5b42a8751
1 changed files with 2 additions and 28 deletions

View File

@ -331,40 +331,14 @@ class Detail extends Component{
{
projectDetail && projectDetail.forked_from_project_id && projectDetail.fork_info ?
<Tooltip placement={'right'} title={text}>
<a href={`/users/${ projectDetail.fork_info.fork_project_user_login}/projects`}
target="_blank"
<Link to={`/projects/${projectDetail.forked_from_project_id}/coders`}
className="ml20" >
<i className="iconfont icon-fork color-grey-74 font-20 fl"></i>
</a>
</Link>
</Tooltip>:""
}
</span>
</p>
{/* {
projectDetail && projectDetail.forked_from_project_id && projectDetail.fork_info ? */}
{/* <a href={`/users/${ projectDetail && projectDetail.fork_info && projectDetail.fork_info.fork_project_user_login}/projects`}
className="fl mt5"
target="_blank"
data-tip-right={`forked from ${projectDetail && projectDetail.fork_info &&projectDetail.fork_info.fork_project_user_name} / ${projectDetail && projectDetail.fork_info &&projectDetail.fork_info.fork_form_name}`}>
<i className="iconfont icon-fork color-grey-74 font-20 fl"></i>
</a> */}
{/* // <div className="fork-css font-14 color-grey-ccc df flex-1 lineH2" style={{alignItems:"center"}}>
// <span className="mr10">
// <img src={img_fork} alt="" width="13px"/>
// </span>
// <span className="mr10">forked from</span>
// <Link to={`/users/${projectDetail.fork_info.fork_project_user_login}/projects`} className="show-user-link color-grey-ccc">
// {projectDetail.fork_info.fork_project_user_name}
// </Link>
// <span className="ml5 mr5">/</span>
// <span className="hide-1 flex-1">
// <Link to={`/projects/${projectDetail.forked_from_project_id}/coders`} className="color-grey-ccc">{ projectDetail.fork_info.fork_form_name }</Link>
// </span>
// </div> */}
{/* :
""
} */}
</div>
<div className="f-wrap-between">
<ul className="headerMenu-wrapper">