diff --git a/.idea/workspace.xml b/.idea/workspace.xml index 9013af44a..aba950566 100644 --- a/.idea/workspace.xml +++ b/.idea/workspace.xml @@ -1,12 +1,7 @@ - - - - - - + - + @@ -152,13 +239,19 @@ - + + + + + + + + diff --git a/src/forge/Images/nodata.png b/src/forge/Images/nodata.png new file mode 100644 index 000000000..ad4c76b97 Binary files /dev/null and b/src/forge/Images/nodata.png differ diff --git a/src/forge/Main/CoderRootBranch.js b/src/forge/Main/CoderRootBranch.js index c8a85bca2..971126330 100644 --- a/src/forge/Main/CoderRootBranch.js +++ b/src/forge/Main/CoderRootBranch.js @@ -1,6 +1,7 @@ import React , { Component } from 'react'; import { Link } from "react-router-dom"; import { Dropdown , Menu , Icon , Tooltip } from 'antd'; +import { truncateCommitId } from '../common/util'; import './list.css' import { branch } from 'recompose'; @@ -21,7 +22,7 @@ class CoderRootBranch extends Component { if(branchList && branchList.length>0){ return( - + - this.focusFunc(projectDetail && projectDetail.watched)}> - - {projectDetail && projectDetail.watched ? '取消关注':'关注'} + this.focusFunc(watched)}> + + {watched ? '取消关注':'关注'} {watchers_count} - this.pariseFunc(projectDetail && projectDetail.praised)}> - - {projectDetail && projectDetail.praised ? '取消点赞':'点赞'} + this.pariseFunc(praised)}> + + {praised ? '取消点赞':'点赞'} {praises_count} diff --git a/src/forge/Merge/MergeDetail.js b/src/forge/Merge/MergeDetail.js index 8e5aa0935..6a6b82a19 100644 --- a/src/forge/Merge/MergeDetail.js +++ b/src/forge/Merge/MergeDetail.js @@ -6,7 +6,7 @@ import Nav from '../Order/Nav'; import UploadComponent from '../Upload/Index'; import{ Modal,Col,Form,Input,Tooltip,Popconfirm } from 'antd' -import NoneData from '../../modules/courses/coursesPublic/NoneData'; +import NoneData from '../Nodata'; const TextArea = Input.TextArea; @@ -226,7 +226,7 @@ class MergeDetail extends Component{ ) }else{ return( - + ) } } @@ -235,14 +235,23 @@ class MergeDetail extends Component{

{ data && data.issue.subject} -

- 编辑 +
+ { + data && data.issue.user_permission ? + 编辑 + : '' + }

{ data && data.issue.description}

diff --git a/src/forge/Merge/MessageCount.js b/src/forge/Merge/MessageCount.js index c27dcb532..293fda86f 100644 --- a/src/forge/Merge/MessageCount.js +++ b/src/forge/Merge/MessageCount.js @@ -479,7 +479,11 @@ class MessageCount extends Component{
@@ -501,7 +505,11 @@ class MessageCount extends Component{ {/* 由 { data && data.issue.author_name} 于 { data && data.issue.created_at }创建{ data && data.issue.journals_count && data.issue.journals_count > 0 ?` · ${data.issue.journals_count} 条评论`:""} */} - 编辑 + { + data && data.issue.user_permission ? + 编辑 + : '' + }

@@ -531,45 +539,51 @@ class MessageCount extends Component{ { Paginations } -
- -
-

该合并请求可以进行自动合并操作

-

- {/* */} - {/* */} - }> - {this.state.mergename} - - - {/* */} -

- -
- -
- + + { + data && data.issue.user_permission ? +
+ +
+

该合并请求可以进行自动合并操作

+

+ {/* */} + {/* */} + }> + {this.state.mergename} + + + {/* */} +

+ +
+ +
+ +
+ {/* */} @@ -536,17 +536,17 @@ class CodeRepositoryView extends Component { }
-
{/* { tabIndex === STABLE_SSH_TAB_ID && this.state.sshData && } */}
-
-
-
@@ -554,13 +554,13 @@ class CodeRepositoryView extends Component { ); } } -/* +/* <%= Redmine::CodesetUtil.replace_invalid_utf8(@content) %> - , overflow: 'scroll' ref="editor" + , overflow: 'scroll' ref="editor" - */ -export default CodeRepositoryView; \ No newline at end of file +export default CodeRepositoryView; diff --git a/src/modules/test/codemirror/TestCodeMirror.js b/src/modules/test/codemirror/TestCodeMirror.js index f451bc356..08ca32f15 100644 --- a/src/modules/test/codemirror/TestCodeMirror.js +++ b/src/modules/test/codemirror/TestCodeMirror.js @@ -1,6 +1,6 @@ import React, { Component } from 'react'; -import CodeMirror from 'react-codeMirror' +import CodeMirror from 'react-codemirror' require('codemirror/lib/codemirror.css'); require('codemirror/mode/javascript/javascript'); @@ -28,13 +28,13 @@ class TestCodeMirror extends Component { componentDidMount() { var readOnlyLines = [0,1,2,3,8]; - + this.refs.editor.getCodeMirror().on('beforeChange',function(cm,change) { console.log('change.from.line', change.from.line) - if ( readOnlyLines.indexOf(change.from.line) !== -1 + if ( readOnlyLines.indexOf(change.from.line) !== -1 // 有问题：如果用回车将有内容的行挤到不可编辑的行，那么无法删除掉不可编辑行里的内容了 // 解决办法：将所需的行数固定写好，禁用掉回车键。 - // || change.from.line > ( readOnlyLines[readOnlyLines.length -1] + 1 ) + // || change.from.line > ( readOnlyLines[readOnlyLines.length -1] + 1 ) ) { change.cancel(); } @@ -60,4 +60,4 @@ class TestCodeMirror extends Component { } } -export default TestCodeMirror; \ No newline at end of file +export default TestCodeMirror;