Gitlink
/
forgeplus-react
39
0
Fork 30
Code Issues Pull Requests Releases 1 Wiki Activity

合并请求-判断条件改成user_admin_or_member

This commit is contained in:
caishi 2021-08-27 14:04:27 +08:00
parent dee7b23f3e
commit a1b5395b8c
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/forge/Merge/MergeItem.js
View File

@ -49,7 +49,7 @@ class MergeItem extends Component {
}; };
render() { render() {
const { issues, project_name, project_author_name , user_admin_or_member} = this.props; const { issues, project_name, project_author_name , user_admin_or_developer} = this.props;
const { projectsId , owner } = this.props.match.params; const { projectsId , owner } = this.props.match.params;
const { current_user } = this.props; const { current_user } = this.props;
const renderList = () => { const renderList = () => {
@ -183,7 +183,7 @@ class MergeItem extends Component {
) : ( ) : (
"" ""
)} )}
{user_admin_or_member && item.pull_request_status === 0 ? ( {user_admin_or_developer && item.pull_request_status === 0 ? (
<div <div
className="milepostleft" className="milepostleft"
style={{ style={{

8
src/forge/Merge/merge.js
View File

@ -4,7 +4,7 @@ import "./merge.css";
import "../Order/order.css"; import "../Order/order.css";
import "../Order/index.scss"; import "../Order/index.scss";
import NoneData from "./no_data"; import NoneData from "./no_data";
import OrderItem from "./MergeItem"; import MergeItem from "./MergeItem";
import './Index.scss'; import './Index.scss';
import axios from "axios"; import axios from "axios";
@ -387,7 +387,7 @@ class merge extends Component {
<Spin spinning={isSpin}> <Spin spinning={isSpin}>
{data && data.search_count && data.search_count > 0 ? ( {data && data.search_count && data.search_count > 0 ? (
<div> <div>
<OrderItem <MergeItem
issues={issues} issues={issues}
search_count={search_count} search_count={search_count}
page={select_params.page} page={select_params.page}
@ -396,8 +396,8 @@ class merge extends Component {
project_author_name={data.project_author_name} project_author_name={data.project_author_name}
{...this.props} {...this.props}
{...this.state} {...this.state}
user_admin_or_member={data && data.user_admin_or_member} user_admin_or_developer={data && data.user_admin_or_developer}
></OrderItem> ></MergeItem>
</div> </div>
):""} ):""}
{search_count > select_params.limit ? ( {search_count > select_params.limit ? (