- {item.author.name}/
{item.name}
+ {item.author.name}/{item.name}{item.description}
From 993f662f455ddd8d145edd3a94074699c3147520 Mon Sep 17 00:00:00 2001 From: dinglink <837816638@qq.com> Date: Fri, 3 Apr 2020 16:45:59 +0800 Subject: [PATCH 2/9] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E6=9D=83=E9=99=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/forge/Merge/merge.js | 14 +++++++++++--- src/forge/Order/order.js | 18 +++++++++++++----- 2 files changed, 24 insertions(+), 8 deletions(-) diff --git a/src/forge/Merge/merge.js b/src/forge/Merge/merge.js index 948e75bbc..08caa9004 100644 --- a/src/forge/Merge/merge.js +++ b/src/forge/Merge/merge.js @@ -215,6 +215,7 @@ class merge extends Component{ }) } } + this.setState({ order_name:e.key, @@ -223,6 +224,15 @@ class merge extends Component{ this.getIssueList(1,limit,search,author_id,assigned_to_id,status_type,undefined,undefined, e.item.props.value,e.key); } + islogin(){ + const { projectsId } = this.props.match.params; + if (this.props.checkIfLogin() === false) { + this.props.showLoginDialog() + return + }else{ + this.props.history.push(`/projects/${projectsId}/merge/new`); + } + } render(){ const { issue_chosen , issues , limit , page , search_count , data , isSpin,openselect,closeselect } = this.state; @@ -252,9 +262,7 @@ class merge extends Component{
{
- data && data.user_admin_or_member ?
- 创建合并请求
- : ''
+ this.islogin()}>创建合并请求
}
diff --git a/src/forge/Order/order.js b/src/forge/Order/order.js
index ea486a7aa..d6755bcf3 100644
--- a/src/forge/Order/order.js
+++ b/src/forge/Order/order.js
@@ -1,13 +1,12 @@
import React , { Component } from "react";
import {Link} from 'react-router-dom';
-import { Input ,Dropdown , Menu , Icon , Pagination , Spin } from 'antd';
+import { Input ,Dropdown , Menu , Icon , Pagination , Spin, Button } from 'antd';
import './order.css';
import NoneData from '../Nodata';
import Nav from './Nav';
import OrderItem from './OrderItem';
-
import axios from 'axios';
const Search = Input.Search;
@@ -336,6 +335,16 @@ class order extends Component{
console.log(id)
}
+ islogin(){
+ const { projectsId } = this.props.match.params;
+ if (this.props.checkIfLogin() === false) {
+ this.props.showLoginDialog()
+ return
+ }else{
+ this.props.history.push(`/projects/${projectsId}/orders/new`);
+ }
+ }
+
render(){
const { current_user } = this.props;
@@ -366,9 +375,7 @@ class order extends Component{
From b3cd5459e5e62c5b4f2d3d440d2e7bacd4f3e656 Mon Sep 17 00:00:00 2001
From: "sylor_huang@126.com"
{
- data && data.user_admin_or_member ?
- 创建工单
- : ''
+ this.islogin()} >创建工单
}
@@ -448,6 +455,7 @@ class order extends Component{
{item.author.name}/{item.name}
+ {
+ item.is_public ? "" :
+ 私有
+ }
{item.description}
From c62b99eb618574151c1dbaa38b4adf4ab9d16b58 Mon Sep 17 00:00:00 2001 From: "sylor_huang@126.com"-
-
+ {
+ projectDetail && projectDetail.forked_from_project_id ?
+
+
+
+ : ""
+ }
{projectDetail && projectDetail.author && projectDetail.author.name}
/
{ projectDetail && projectDetail.name }
+ Forked From + + {projectDetail.fork_info.fork_project_user_name} + / + + { projectDetail.fork_info.fork_form_name } + +
+ : + "" + }-
diff --git a/src/forge/Main/IndexItem.js b/src/forge/Main/IndexItem.js
index 8d29d23fe..785d3dbf2 100644
--- a/src/forge/Main/IndexItem.js
+++ b/src/forge/Main/IndexItem.js
@@ -4,6 +4,7 @@ import { Link } from 'react-router-dom';
import '../css/index.css'
import './list.css';
import img_parise from '../Images/parise.png';
+import img_fork from '../Images/fork.png';
class IndexItem extends Component{
// constructor(props){
// super(props);
@@ -25,7 +26,17 @@ class IndexItem extends Component{
- {item.author.name}/{item.name}
+
+ {item.author.name}/{item.name}
+ {
+ item.forked_from_project_id ?
+
+ 
+
+ : ""
+ }
+
+
{
item.is_public ? "" :
私有
diff --git a/src/forge/Merge/MergeItem.js b/src/forge/Merge/MergeItem.js
index 553a4a6d7..3d524fc5e 100644
--- a/src/forge/Merge/MergeItem.js
+++ b/src/forge/Merge/MergeItem.js
@@ -42,6 +42,7 @@ class MergeItem extends Component{
render(){
const { issues , search_count , page , limit } = this.props;
const { projectsId } = this.props.match.params;
+ const { current_user } = this.props;
const renderList =()=>{
if(issues && issues.length > 0){
return(
@@ -73,11 +74,16 @@ class MergeItem extends Component{
diff --git a/src/forge/Order/OrderItem.js b/src/forge/Order/OrderItem.js
index ba09be430..5104b08ef 100644
--- a/src/forge/Order/OrderItem.js
+++ b/src/forge/Order/OrderItem.js
@@ -47,6 +47,7 @@ class OrderItem extends Component{
render(){
const { issues , search_count , page , limit } = this.props;
const { projectsId } = this.props.match.params;
+ const {current_user} = this.props
const renderList =()=>{
if(issues && issues.length > 0){
@@ -82,16 +83,20 @@ class OrderItem extends Component{
{ item.journals_count ? {item.journals_count} : "" }
-
-
+ {
+ current_user && current_user.login ?
+
-
-
-
+
+ :""
+ }
+
+
+
+ { item.journals_count ? {item.journals_count} : "" }
-
-
+ {
+ current_user && current_user.login ?
+
-
-
-
- this.deletedetail(item.id)}>
-
-
-
-
+
+ : ""
+ }
+
+
+
+ this.deletedetail(item.id)}>
+
+
+
+
-
+
{ projectDetail && projectDetail.forked_from_project_id ? @@ -317,21 +317,22 @@ class Detail extends Component{ { projectDetail && projectDetail.name } -
- { - projectDetail && projectDetail.forked_from_project_id && projectDetail.fork_info ? -- Forked From + { + projectDetail && projectDetail.forked_from_project_id && projectDetail.fork_info ? +
+ Forked From
- {projectDetail.fork_info.fork_project_user_name}
- /
-
+ {projectDetail.fork_info.fork_project_user_name}
+ /
+
{ projectDetail.fork_info.fork_form_name }
-
- :
- ""
- }
+
+ :
+ ""
+ }
+
+
-
diff --git a/src/forge/Main/list.css b/src/forge/Main/list.css
index b39f49d35..d2d8a83bb 100644
--- a/src/forge/Main/list.css
+++ b/src/forge/Main/list.css
@@ -567,3 +567,9 @@ border: 1px solid #2185d0;
height: auto;
}
.text-center{text-align: center;}
+.fork-css{
+ position: absolute;
+ left: 0;
+ top: 50px;
+ width: 100%;
+}
From b04649dc7cf2a7d0c8f12e9ba9d84321c3ff12db Mon Sep 17 00:00:00 2001
From: "sylor_huang@126.com"
-
+
{ projectDetail && projectDetail.forked_from_project_id ? @@ -317,21 +317,22 @@ class Detail extends Component{ { projectDetail && projectDetail.name } - { - projectDetail && projectDetail.forked_from_project_id && projectDetail.fork_info ? -
- Forked From
- {projectDetail.fork_info.fork_project_user_name}
- /
-
- { projectDetail.fork_info.fork_form_name }
-
-
- :
- ""
- }
+ {
+ projectDetail && projectDetail.forked_from_project_id && projectDetail.fork_info ?
+
+ Forked From
+
+ {projectDetail.fork_info.fork_project_user_name}
+ /
+
+ { projectDetail.fork_info.fork_form_name }
+
+
+ :
+ ""
+ }
diff --git a/src/forge/Main/list.css b/src/forge/Main/list.css
index d2d8a83bb..d8c0eeb7b 100644
--- a/src/forge/Main/list.css
+++ b/src/forge/Main/list.css
@@ -573,3 +573,9 @@ border: 1px solid #2185d0;
top: 50px;
width: 100%;
}
+.color-grey-ccc{
+ color: #ccc;
+}
+a.color-grey-ccc:hover{
+ color: #4cacff !important;
+}
\ No newline at end of file
From 401c3ef3dc31bfcc12988de088721d02468c4896 Mon Sep 17 00:00:00 2001
From: "sylor_huang@126.com"
Date: Tue, 7 Apr 2020 15:12:27 +0800
Subject: [PATCH 8/9] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=A0=B7=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.idea/workspace.xml | 39 +++++++++++++++++++--------------------
src/forge/Main/list.css | 2 +-
2 files changed, 20 insertions(+), 21 deletions(-)
diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 7acba6f4d..18b33b746 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -2,7 +2,6 @@
+
-
-
+
-
+
-
-
+
@@ -159,8 +158,8 @@
.color-white
color-white
posi
- projectDe
pository
+ projectDe
$PROJECT_DIR$
@@ -210,8 +209,8 @@
-
+
@@ -308,12 +307,12 @@
-
+
@@ -824,17 +823,10 @@
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/src/forge/Main/list.css b/src/forge/Main/list.css
index d8c0eeb7b..8bd0562f1 100644
--- a/src/forge/Main/list.css
+++ b/src/forge/Main/list.css
@@ -574,7 +574,7 @@ border: 1px solid #2185d0;
width: 100%;
}
.color-grey-ccc{
- color: #ccc;
+ color: #ccc !important;
}
a.color-grey-ccc:hover{
color: #4cacff !important;
From b9d7d4d6d63fafd5d1cb631b1a5508c675cd9eec Mon Sep 17 00:00:00 2001
From: "sylor_huang@126.com"
Date: Tue, 7 Apr 2020 15:22:47 +0800
Subject: [PATCH 9/9] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=A0=B7=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.idea/workspace.xml | 15 +++++++--------
1 file changed, 7 insertions(+), 8 deletions(-)
diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 18b33b746..89b18ea8f 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -87,7 +87,7 @@
-
-
@@ -307,16 +307,15 @@
-
+
-
-
-
-
-