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{
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{
@@ -448,6 +455,7 @@ class order extends Component{
}
{ Paginations }
+