-
-
:""
)
+
+
return(
-
- {/* 新建文件 */}
- ()
- }
- >
- ()
- }
- >
+
+ {/* 新建文件 */}
+ (
+ (
- {/* 标签列表 */}
- ()
- }
- >
- {/* 仓库设置 */}
- ()
- }
- >
- {/* 工单详情 */}
- ()
- }
- >
- {/* 里程碑 */}
- ()
- }
- >
- {/* 新建里程碑 */}
- ()
- }
- >
- {/*里程碑详情*/ }
- ()
- }
- >
- {/*修改里程碑*/}
- ()
- }
- >
+ {/* 标签列表 */}
+ (
+ {/* 仓库设置 */}
+ ()
+ }
+ >
+ {/* 工单详情 */}
+ (
+ {/* 里程碑 */}
+ (
+ {/* 新建里程碑 */}
+ (
+ {/*里程碑详情*/ }
+ (
+ {/*修改里程碑*/}
+ (
- {/* 新建工单 */}
+ {/* 新建工单 */}
- ()
- }
- >
+ (
- {/* 修改详情 */}
- ()
- }
- >
+ {/* 修改详情 */}
+ (
- {/* 复制详情 */}
- ()
- }
- >
+ {/* 复制详情 */}
+ (
- {/* 动态 */}
- ()
- }
- >
+ {/* 动态 */}
+ (
- {/* 代码Index */}
- ()
- }
- >
+ {/* 代码Index */}
+ (
- ()
- }
- >
+ (
- ()
- }
- >
+ (
- ()
- }
- >
+ (
- ()
- }
- >
- ()
- }
- >
+ (
+ (
- ()
- }
- >
+ (
- ()
- }
- >
+ (
- ()
- }
- >
- ()
- }
- >
- ()
- }
- >
-
+ (
+ (
+ (
+
+
)
}
}
-export default Detail;
+export default withRouter(Detail);
diff --git a/src/forge/Main/Index.js b/src/forge/Main/Index.js
index 2c13704a1..bafed7671 100644
--- a/src/forge/Main/Index.js
+++ b/src/forge/Main/Index.js
@@ -177,6 +177,7 @@ class Index extends Component{
}
render(){
+ const { current_user } = this.props;
const menu=(
-
- - {projectDetail && projectDetail.author && projectDetail.author.name} - / - - { projectDetail && projectDetail.name } - -
-
- 
- {projectDetail && projectDetail.watched ? '取消关注':'关注'}
-
- {watchers_count}
+
+
- -
-
- -1 || urlFlag) ? "active" : ""}>
代码
- - -1 ? "active" : ""}>
工单{projectDetail&&projectDetail.issues_count===0?"":projectDetail&&projectDetail.issues_count===0?projectDetail.issues_count:""}
- - -1 ? "active" : ""}>
合并请求{projectDetail&&projectDetail.pull_requests_count===0?"":projectDetail&&projectDetail.pull_requests_count===0?projectDetail.pull_requests_count:""}
- - -1 ? "active" : ""}>
版本发布
- - -1 ? "active" : ""}>
动态
- {
- isManager &&
- - 0 ? "active" : ""}>
仓库设置
- }
-
+
-
+
+
+ + {projectDetail && projectDetail.author && projectDetail.author.name} + / + + { projectDetail && projectDetail.name } + +
+
+
+ {projectDetail && projectDetail.watched ? '取消关注':'关注'}
+
+ {watchers_count}
+
+
+ this.pariseFunc(projectDetail && projectDetail.praised)}>
+
+ {projectDetail && projectDetail.praised ? '取消点赞':'点赞'}
+
+ {praises_count}
+
+
+
+ 
Fork
+ {forked_count}
+
-
- this.pariseFunc(projectDetail && projectDetail.praised)}>
-
- {projectDetail && projectDetail.praised ? '取消点赞':'点赞'}
-
- {praises_count}
-
-
-
- Fork
- {forked_count}
-
-
+
-
+
- -1 || urlFlag) ? "active" : ""}>
+
- -1 ? "active" : ""}>
+
- -1 ? "active" : ""}>
+
- -1 ? "active" : ""}>
+
- -1 ? "active" : ""}>
+ {
+ isManager &&
+
- 0 ? "active" : ""}>
+ }
+
@@ -218,12 +221,14 @@ class Index extends Component{
-
-
-
- 
新建
-
-
+ {
+ current_user && current_user.login &&
+
+
+ 新建
+
+
+ }
diff --git a/src/forge/Merge/MergeSubmit.js b/src/forge/Merge/MergeSubmit.js
index 422730270..eb32752ba 100644
--- a/src/forge/Merge/MergeSubmit.js
+++ b/src/forge/Merge/MergeSubmit.js
@@ -165,7 +165,7 @@ class MergeSubmit extends Component{
-
-
+
+ {
+ data && data.search_count && data.search_count > 0 ?
+
)
}
diff --git a/src/forge/New/Index.js b/src/forge/New/Index.js
index 8a42f2b4e..68ec6cad7 100644
--- a/src/forge/New/Index.js
+++ b/src/forge/New/Index.js
@@ -23,7 +23,6 @@ class Index extends Component{
GitignoreList:undefined,
LicensesList:undefined,
isSpin:false,
- current_user:undefined
}
}
getUserInfo=()=>{
@@ -40,7 +39,7 @@ class Index extends Component{
})
}
componentDidMount=()=>{
- this.getUserInfo();
+ // this.getUserInfo();
// 获取项目类别
this.getCategory();
// 获取项目语言
@@ -116,7 +115,7 @@ class Index extends Component{
})
this.props.form.validateFieldsAndScroll((err, values) => {
if(!err){
- const { current_user } = this.state;
+ const { current_user } = this.props;
const { projectsType } =this.props.match.params;
const url = projectsType === "deposit" ? "/projects.json" :"/projects/migrate.json";
axios.post(url,{
@@ -129,7 +128,7 @@ class Index extends Component{
isSpin:false
})
this.props.showNotification(`${projectsType === "deposit" ? "托管" :"镜像"}项目创建成功!`);
- this.props.history.push(`/projects/${result.data.identifier}/${current_user && current_user.login}/coders`);
+ this.props.history.push(`/projects/${result.data.id}/coders`);
}
}
}).catch((error)=>{
@@ -148,7 +147,6 @@ class Index extends Component{
render(){
const { getFieldDecorator } = this.props.form;
- console.log(this.props);
// 项目类型：deposit-托管项目，mirror-镜像项目
const { projectsType } =this.props.match.params;
const {
@@ -165,6 +163,8 @@ class Index extends Component{
LicensesList,
isSpin
}=this.state;
+
+ console.log("current_user",this.props);
return(
{ data ? - 【{ data.issue.tracker}】 + 【{ data.issue.issue_classify==='issue'?data.issue.tracker:"合并"}】 : "" } @@ -173,7 +173,7 @@ class MergeSubmit extends Component{
- {data&&data.issue.issue_status==="关闭"?"关闭中":"开启中"} + {data&&data.issue.issue_status==="关闭"?"关闭中":data&&data.pull_request.status===0?"开启中":"已合并"} 由 { data && data.issue.author_name} 于 { data && data.issue.created_at }创建{ data && data.issue.journals_count && data.issue.journals_count > 0 ?` · ${data.issue.journals_count} 条评论`:""} diff --git a/src/forge/Merge/MessageCount.js b/src/forge/Merge/MessageCount.js index b03547f5e..a11c99300 100644 --- a/src/forge/Merge/MessageCount.js +++ b/src/forge/Merge/MessageCount.js @@ -476,8 +476,8 @@ class MessageCount extends Component{
-
-
+
+
this.prmerge()}>合并请求 diff --git a/src/forge/Merge/NewMerge.js b/src/forge/Merge/NewMerge.js index 068d34c9d..3a93560c1 100644 --- a/src/forge/Merge/NewMerge.js +++ b/src/forge/Merge/NewMerge.js @@ -201,7 +201,7 @@ class NewMerge extends Component{ ischeckmerge=(head,base)=>{ const { projectsId } = this.props.match.params; - const url = `/projects/${projectsId}/pull_requests/check_can_merge`; + const url = `/projects/${projectsId}/pull_requests/check_can_merge.json`; axios.post(url,{ project_id:projectsId, head:head, diff --git a/src/forge/Merge/merge.js b/src/forge/Merge/merge.js index 518048e13..b20dd3866 100644 --- a/src/forge/Merge/merge.js +++ b/src/forge/Merge/merge.js @@ -248,62 +248,73 @@ class merge extends Component{
- 创建合并请求
-
-
- this.openorder(1)}>{data && data.open_count}个开启中
- this.openorder(2)}>{data && data.close_count}个已关闭
- {/* {data && data.open_count}个开启中
- {data && data.close_count}个已关闭 */}
-
-
- -
-
-
-
{
- search_count === 0 ?
- -
-
- -
-
-
-
-
- {this.state.issue_tag_ids} --
- -
-
- {this.state.fixed_version_ids} --
- -
-
- {this.state.assigned_to_ids} --
-
- -
-
- {this.state.paix} --
-
+
+
+
+ :
+
+ this.openorder(1)}>{data && data.open_count}个开启中
+ this.openorder(2)}>{data && data.close_count}个已关闭
+ {/* {data && data.open_count}个开启中
+ {data && data.close_count}个已关闭 */}
+
+
+ +
+
+
+
+ {
+ search_count === 0 ?
+ -
+
- +
-
+
-
+
+ {this.state.issue_tag_ids} ++
+ -
+
+ {this.state.fixed_version_ids} ++
+ -
+
+ {this.state.assigned_to_ids} ++
+
+ -
+
+ {this.state.paix} ++
+
diff --git a/src/forge/Order/CopyDetail.js b/src/forge/Order/CopyDetail.js
index 4322bdd3d..d3e260d6f 100644
--- a/src/forge/Order/CopyDetail.js
+++ b/src/forge/Order/CopyDetail.js
@@ -106,6 +106,16 @@ class CopyDetail extends Component{
isShow:true
});
};
+ stringJson=(value) =>{
+ let _value = null;
+
+ try {
+ _value = JSON.parse(value);
+ } catch (e) {
+ _value = value;
+ }
+ return _value
+ }
//删除工单
deleteorder=(id)=>{
@@ -225,9 +235,8 @@ class CopyDetail extends Component{
)}
- {
- console.log("imgOnclick",value);
+ // console.log("imgOnclick",value);
+ }
+
+ stringJson=(value) =>{
+ let _value = null;
+
+ try {
+ _value = JSON.parse(value);
+ } catch (e) {
+ _value = value;
+ }
+ return _value
}
commentCtx = (ctx) => {
@@ -387,7 +398,26 @@ class Detail extends Component{
}
-