From abe2d8d537788ea16a13856ba8d416ac2b849531 Mon Sep 17 00:00:00 2001 From: "sylor_huang@126.com" Date: Fri, 18 Sep 2020 17:18:28 +0800 Subject: [PATCH 1/3] Change Issues Clean Routes --- src/forge/Order/order.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/forge/Order/order.js b/src/forge/Order/order.js index 51a94f3e5..fb0480ce3 100644 --- a/src/forge/Order/order.js +++ b/src/forge/Order/order.js @@ -471,7 +471,7 @@ class order extends Component { }) const { checkedValue } = this.state; const { projectsId , owner } = this.props.match.params; - const url = `/projects/${owner}/${projectsId}/issues/clean.json`; + const url = `/issues/clean.json`; axios.post(url, { ids: checkedValue }).then(result => { From 7b32b39285a3e7835341be2e211afefdecbbc578 Mon Sep 17 00:00:00 2001 From: "sylor_huang@126.com" Date: Fri, 18 Sep 2020 17:25:36 +0800 Subject: [PATCH 2/3] Change Issues Clean Routes --- src/forge/Order/order.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/forge/Order/order.js b/src/forge/Order/order.js index fb0480ce3..2a8349cac 100644 --- a/src/forge/Order/order.js +++ b/src/forge/Order/order.js @@ -471,7 +471,7 @@ class order extends Component { }) const { checkedValue } = this.state; const { projectsId , owner } = this.props.match.params; - const url = `/issues/clean.json`; + const url = `/${owner}/${projectsId}/issues/clean.json`; axios.post(url, { ids: checkedValue }).then(result => { From 2e6acd00248084171874e1648f6df5166e09a227 Mon Sep 17 00:00:00 2001 From: caishi <1149225589@qq.com> Date: Wed, 23 Sep 2020 16:08:38 +0800 Subject: [PATCH 3/3] name --- src/forge/UsersList/user_list.js | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/src/forge/UsersList/user_list.js b/src/forge/UsersList/user_list.js index a214173de..c6a673135 100644 --- a/src/forge/UsersList/user_list.js +++ b/src/forge/UsersList/user_list.js @@ -5,7 +5,7 @@ import { Button } from "antd"; import "./list.css"; class UserList extends Component { - renderList = (users, userClass, current_user) => { + renderList = (users, userClass, current_user, type_title) => { if (users && users.length > 0) { return users.map((item, key) => { return ( @@ -34,7 +34,7 @@ class UserList extends Component {
- 加入时间:{item.format_time} + {type_title === '点赞列表' ? "点赞" : type_title === "关注列表" ? "关注":'fork'}时间:{item.format_time}
{ current_user && current_user.login === item.login ? @@ -50,10 +50,9 @@ class UserList extends Component { } } render() { - const { users, userClass, current_user } = this.props; - + const { users, userClass, current_user , type_title } = this.props; return ( - this.renderList(users, userClass, current_user) + this.renderList(users, userClass, current_user, type_title) ); } }