From a16d9871a3e1301d66d7a2236cea127924774c51 Mon Sep 17 00:00:00 2001 From: caicai8 <1149225589@qq.com> Date: Fri, 20 Mar 2020 21:40:43 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E8=B7=AF=E7=94=B1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/forge/Activity/ActivityItem.js | 8 +-- src/forge/Index.js | 2 +- src/forge/Main/CoderRootBranch.js | 6 +-- src/forge/Main/CoderRootDirectory.js | 4 +- src/forge/Main/CoderRootIndex.js | 8 +-- src/forge/Main/Detail.js | 69 ++++++++++++------------ src/forge/Main/DetailTop.js | 6 +-- src/forge/Main/IndexItem.js | 2 +- src/forge/Merge/MergeDetail.js | 10 ++-- src/forge/Merge/MergeItem.js | 4 +- src/forge/Merge/MergeSubmit.js | 10 ++-- src/forge/Merge/MessageCount.js | 10 ++-- src/forge/Merge/NewMerge.js | 8 +-- src/forge/Merge/UpdateMerge.js | 8 +-- src/forge/Merge/merge.js | 4 +- src/forge/Newfile/UserSubmitComponent.js | 4 +- src/forge/Order/CopyDetail.js | 14 ++--- src/forge/Order/Detail.js | 14 ++--- src/forge/Order/Milepost.js | 8 +-- src/forge/Order/MilepostDetail.js | 6 +-- src/forge/Order/Nav.js | 6 +-- src/forge/Order/New.js | 4 +- src/forge/Order/OrderItem.js | 6 +-- src/forge/Order/UpdateDetail.js | 8 +-- src/forge/Order/UpdateMilepost.js | 4 +- src/forge/Order/newMilepost.js | 4 +- src/forge/Order/order.js | 4 +- src/forge/Settings/Index.js | 12 ++--- src/forge/Version/NewVersion.js | 4 +- src/forge/Version/UpdateVersion.js | 8 +-- src/forge/Version/version.js | 6 +-- 31 files changed, 135 insertions(+), 136 deletions(-) diff --git a/src/forge/Activity/ActivityItem.js b/src/forge/Activity/ActivityItem.js index 115e774e5..dfecf1c9a 100644 --- a/src/forge/Activity/ActivityItem.js +++ b/src/forge/Activity/ActivityItem.js @@ -6,7 +6,7 @@ import { getImageUrl } from 'educoder'; class ActivityItem extends Component{ render(){ - const { projectsId , author } = this.props.match.params; + const { projectsId } = this.props.match.params; const { item } = this.props; return( @@ -14,20 +14,20 @@ class ActivityItem extends Component{ {/* 如果是版本发布 */} { item.trend_type==="VersionRelease"?  - {item.name} + {item.name} {item.trend_type}

: // 如果是工单 item.trend_type==="Issue"? - {item.name} + {item.name} {item.trend_type}

: // 如果是合并请求 - {item.name} + {item.name} {item.trend_type}

} diff --git a/src/forge/Index.js b/src/forge/Index.js index 6dae58533..42d83baf5 100644 --- a/src/forge/Index.js +++ b/src/forge/Index.js @@ -54,7 +54,7 @@ class Index extends Component{ (props) => () } > - () } diff --git a/src/forge/Main/CoderRootBranch.js b/src/forge/Main/CoderRootBranch.js index 50037cc39..c8a85bca2 100644 --- a/src/forge/Main/CoderRootBranch.js +++ b/src/forge/Main/CoderRootBranch.js @@ -16,7 +16,7 @@ class CoderRootBranch extends Component { render(){ const { branchList, projectDetail } = this.props; - const { projectsId , author } = this.props.match.params; + const { projectsId } = this.props.match.params; const list =()=>{ if(branchList && branchList.length>0){ return( @@ -29,7 +29,7 @@ class CoderRootBranch extends Component { return(
  • - {item.name} + {item.name} {/*{item.name}*/}

    {item.last_commit && item.last_commit.id} @@ -39,7 +39,7 @@ class CoderRootBranch extends Component {

    - 创建合并请求 + 创建合并请求 diff --git a/src/forge/Main/CoderRootDirectory.js b/src/forge/Main/CoderRootDirectory.js index 8e0dc6850..095674a39 100644 --- a/src/forge/Main/CoderRootDirectory.js +++ b/src/forge/Main/CoderRootDirectory.js @@ -209,7 +209,7 @@ class CoderRootDirectory extends Component{ render(){ const { rootList , branch ,filePath , fileDetail , subFileType , readMeContent, isSpin , rootData } = this.state; const { branchLastCommit , http_url , isManager , isDeveloper } = this.props; - const { projectsId , author } = this.props.match.params; + const { projectsId } = this.props.match.params; const columns = [ { @@ -295,7 +295,7 @@ class CoderRootDirectory extends Component{ { subFileType !== "file" && isManager && isDeveloper &&

    - 新建文件 + 新建文件 上传文件

    } diff --git a/src/forge/Main/CoderRootIndex.js b/src/forge/Main/CoderRootIndex.js index fa6e7c11e..25a17b462 100644 --- a/src/forge/Main/CoderRootIndex.js +++ b/src/forge/Main/CoderRootIndex.js @@ -28,22 +28,22 @@ class CoderRootIndex extends Component{ return(
    - () } > - () } > - () } > - () } diff --git a/src/forge/Main/Detail.js b/src/forge/Main/Detail.js index 5a37c908e..39eee8fed 100644 --- a/src/forge/Main/Detail.js +++ b/src/forge/Main/Detail.js @@ -255,7 +255,7 @@ class Detail extends Component{ const url = `/projects/${project_id}/forks.json`; axios.post(url).then(result=>{ if(result && result.data.status === 0){ - this.props.history.push(`/projects/${result.data.identifier}/${author}/coders`); + this.props.history.push(`/projects/${result.data.identifier}/coders`); }else{ this.props.showNotification(result.data.message); } @@ -290,10 +290,9 @@ class Detail extends Component{ const { projectDetail , watchers_count , praises_count , forked_count , project_id , current_user } = this.state; const url = this.props.history.location.pathname; const urlArr= url.split("/"); - const url_last = urlArr[parseInt(urlArr.length)-1]; - const urlFlag = (urlArr.length === 4); + const urlFlag = (urlArr.length === 3); const { isManager , isDeveloper } = this.props; - const { projectsId , author } = this.props.match.params; + const { projectsId } = this.props.match.params; const { state } = this.props.history.location; return( @@ -305,20 +304,20 @@ class Detail extends Component{ {projectDetail && projectDetail.author && projectDetail.author.name} / - { projectDetail && projectDetail.identifier } + { projectDetail && projectDetail.identifier }

      -
    • 代码
      • -
    • 工单{projectDetail&&projectDetail.issues_count===0?"":projectDetail&&projectDetail.issues_count===0?projectDetail.issues_count:""}
      • -
    • 合并请求{projectDetail&&projectDetail.pull_requests_count===0?"":projectDetail&&projectDetail.pull_requests_count===0?projectDetail.pull_requests_count:""}
      • -
    • 版本发布
      • -
    • 动态
      • +
    • -1 || urlFlag) ? "active" : ""}>代码
      • +
    • -1 ? "active" : ""}>工单{projectDetail&&projectDetail.issues_count===0?"":projectDetail&&projectDetail.issues_count===0?projectDetail.issues_count:""}
      • +
    • -1 ? "active" : ""}>合并请求{projectDetail&&projectDetail.pull_requests_count===0?"":projectDetail&&projectDetail.pull_requests_count===0?projectDetail.pull_requests_count:""}
      • +
    • -1 ? "active" : ""}>版本发布
      • +
    • -1 ? "active" : ""}>动态
      • { isManager && -
    • 0 ? "active" : ""}>仓库设置
      • +
    • 0 ? "active" : ""}>仓库设置
      • }
    @@ -348,55 +347,55 @@ class Detail extends Component{ {/* 新建文件 */} - () } > - () } > {/* 标签列表 */} - () } > {/* 仓库设置 */} - () } > {/* 工单详情 */} - () } > {/* 里程碑 */} - () } > {/* 新建里程碑 */} - () } > {/*里程碑详情*/ } - () } > {/*修改里程碑*/} - () } @@ -405,28 +404,28 @@ class Detail extends Component{ {/* 新建工单 */} - () } > {/* 修改详情 */} - () } > {/* 复制详情 */} - () } > {/* 动态 */} - () } @@ -434,66 +433,66 @@ class Detail extends Component{ {/* 代码Index */} - () } > - () } > - () } > - () } > - () } > - () } > - () } > - () } > - () } > - () } > - () } diff --git a/src/forge/Main/DetailTop.js b/src/forge/Main/DetailTop.js index b6151c7f5..841ddbf7c 100644 --- a/src/forge/Main/DetailTop.js +++ b/src/forge/Main/DetailTop.js @@ -4,15 +4,15 @@ import { Link} from 'react-router-dom'; class DetailTop extends Component{ render(){ const { projectDetail } = this.props; - const { projectsId , author } = this.props.match.params; + const { projectsId } = this.props.match.params; const { pathname } = this.props.location; return(

    - 0 ? "active" : ""}> + 0 ? "active" : ""}> {projectDetail && projectDetail.commits_count}提交 - 0 ? "active" : ""}> + 0 ? "active" : ""}> {projectDetail && projectDetail.branches_count}分支 diff --git a/src/forge/Main/IndexItem.js b/src/forge/Main/IndexItem.js index 17341a215..e32997ae6 100644 --- a/src/forge/Main/IndexItem.js +++ b/src/forge/Main/IndexItem.js @@ -25,7 +25,7 @@ class IndexItem extends Component{

    - {item.name} + {item.name}

    {item.description}

    diff --git a/src/forge/Merge/MergeDetail.js b/src/forge/Merge/MergeDetail.js index 59dc3205c..225e031b2 100644 --- a/src/forge/Merge/MergeDetail.js +++ b/src/forge/Merge/MergeDetail.js @@ -164,7 +164,7 @@ class MergeDetail extends Component{ }) } render(){ - const { projectsId , mergeid , author } = this.props.match.params; + const { projectsId , mergeid } = this.props.match.params; const { data,journalsdata, showFiles } = this.state; const { getFieldDecorator } = this.props.form; const url = this.props.history.location.pathname; @@ -235,14 +235,14 @@ class MergeDetail extends Component{

    { data && data.issue.subject}

    - 编辑 + 编辑

    { data && data.issue.description}

    @@ -256,8 +256,8 @@ class MergeDetail extends Component{
      -
    • 0? "active" : ""}>对话内容
      • -
    • 0 ? "active" : ""}>代码提交
      • +
    • 0? "active" : ""}>对话内容
      • +
    • 0 ? "active" : ""}>代码提交
    diff --git a/src/forge/Merge/MergeItem.js b/src/forge/Merge/MergeItem.js index 4a99f99c8..ea55f1bf4 100644 --- a/src/forge/Merge/MergeItem.js +++ b/src/forge/Merge/MergeItem.js @@ -19,7 +19,7 @@ class MergeItem extends Component{ render(){ const { issues , search_count , page , limit } = this.props; - const { projectsId , author } = this.props.match.params; + const { projectsId } = this.props.match.params; const renderList =()=>{ if(issues && issues.length > 0){ return( @@ -29,7 +29,7 @@ class MergeItem extends Component{

    # {search_count - (key + (page-1) * limit)} - {item.name} + {item.name}

    {item.format_time}发布 diff --git a/src/forge/Merge/MergeSubmit.js b/src/forge/Merge/MergeSubmit.js index b879f8c23..422730270 100644 --- a/src/forge/Merge/MergeSubmit.js +++ b/src/forge/Merge/MergeSubmit.js @@ -105,7 +105,7 @@ class MergeSubmit extends Component{ render(){ - const { projectsId,mergeId , author} = this.props.match.params; + const { projectsId,mergeId } = this.props.match.params; const { data,titledata} = this.state; @@ -158,7 +158,7 @@ class MergeSubmit extends Component{

    @@ -178,7 +178,7 @@ class MergeSubmit 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} 条评论`:""} - 编辑 + 编辑

    @@ -187,8 +187,8 @@ class MergeSubmit extends Component{
      -
    • 0? "active" : ""}>对话内容
      • -
    • 0 ? "active" : ""}>代码提交
      • +
    • 0? "active" : ""}>对话内容
      • +
    • 0 ? "active" : ""}>代码提交
    diff --git a/src/forge/Merge/MessageCount.js b/src/forge/Merge/MessageCount.js index 909cfa64f..b03547f5e 100644 --- a/src/forge/Merge/MessageCount.js +++ b/src/forge/Merge/MessageCount.js @@ -315,7 +315,7 @@ class MessageCount extends Component{ } render(){ - const { projectsId,mergeId , author } = this.props.match.params; + const { projectsId,mergeId } = this.props.match.params; const { data,journalsdata, page, limit, search_count, isSpin, isedit, showFiles } = this.state; const { getFieldDecorator } = this.props.form; const { current_user } = this.props; @@ -411,7 +411,7 @@ class MessageCount extends Component{
    @@ -431,7 +431,7 @@ 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} 条评论`:""} - 编辑 + 编辑

    @@ -445,8 +445,8 @@ class MessageCount extends Component{
      -
    • 0? "active" : ""}>对话内容
      • -
    • 0 ? "active" : ""}>代码提交
      • +
    • 0? "active" : ""}>对话内容
      • +
    • 0 ? "active" : ""}>代码提交
    diff --git a/src/forge/Merge/NewMerge.js b/src/forge/Merge/NewMerge.js index fb583c8f2..068d34c9d 100644 --- a/src/forge/Merge/NewMerge.js +++ b/src/forge/Merge/NewMerge.js @@ -139,7 +139,7 @@ class NewMerge extends Component{ submit=()=>{ this.props.form.validateFieldsAndScroll((err, values) => { if(!err){ - const { projectsId , author } = this.props.match.params; + const { projectsId } = this.props.match.params; const url = `/projects/${projectsId}/pull_requests.json`; if(values.issue_tag_ids.length > 0){ @@ -156,7 +156,7 @@ class NewMerge extends Component{ }).then(result=>{ if(result){ - this.props.history.push(`/projects/${projectsId}/${author}/merge`); + this.props.history.push(`/projects/${projectsId}/merge`); } }).catch(error=>{ @@ -223,7 +223,7 @@ class NewMerge extends Component{ render(){ const { getFieldDecorator } = this.props.form; - const { projectsId , author } = this.props.match.params; + const { projectsId } = this.props.match.params; const { current_user } = this.props; const { issue_tag_ids , fixed_version_id ,assigned_to_id ,issue_chosen,data,titledata} = this.state; @@ -276,7 +276,7 @@ class NewMerge extends Component{ if(this.state.mergedata&&this.state.mergedata.status===-2){ return(
    - 在这些分支直接合并请求已经存在：{this.state.mergedata&&this.state.mergedata.pull_request_name} + 在这些分支直接合并请求已经存在：{this.state.mergedata&&this.state.mergedata.pull_request_name}
    ) }else{ diff --git a/src/forge/Merge/UpdateMerge.js b/src/forge/Merge/UpdateMerge.js index 1c01f3e6a..306523673 100644 --- a/src/forge/Merge/UpdateMerge.js +++ b/src/forge/Merge/UpdateMerge.js @@ -134,7 +134,7 @@ class UpdateMerge extends Component{ const { fileList } = this.state; this.props.form.validateFieldsAndScroll((err, values) => { if(!err){ - const { projectsId , mergeId , author } = this.props.match.params; + const { projectsId , mergeId } = this.props.match.params; const { subject ,data} = this.state; const url = `/projects/${projectsId}/pull_requests/${mergeId}.json`; @@ -155,7 +155,7 @@ class UpdateMerge extends Component{ ...values }).then(result=>{ if(result){ - this.props.history.push(`/projects/${projectsId}/${author}/merge`); + this.props.history.push(`/projects/${projectsId}/merge`); } }).catch(error=>{ console.log(error); @@ -167,7 +167,7 @@ class UpdateMerge extends Component{ render(){ - const { projectsId , mergeId , author } = this.props.match.params; + const { projectsId , mergeId } = this.props.match.params; const { getFieldDecorator } = this.props.form; const { current_user } = this.props; const { issue_tag_ids , fixed_version_id , branch_name , status_id , tracker_id , issue_type ,assigned_to_id , priority_id , done_ratio, @@ -210,7 +210,7 @@ class UpdateMerge extends Component{ }

    保存 - 取消 + 取消

    diff --git a/src/forge/Merge/merge.js b/src/forge/Merge/merge.js index eba3399bf..37ba70162 100644 --- a/src/forge/Merge/merge.js +++ b/src/forge/Merge/merge.js @@ -225,7 +225,7 @@ class merge extends Component{ render(){ const { issue_chosen , issues , limit , page , search_count , data , isSpin,openselect,closeselect } = this.state; - const { projectsId , author } = this.props.match.params; + const { projectsId } = this.props.match.params; const menu = (     this.arrayList(e)}> @@ -250,7 +250,7 @@ class merge extends Component{

    diff --git a/src/forge/Newfile/UserSubmitComponent.js b/src/forge/Newfile/UserSubmitComponent.js index 62fa18a56..d4ccd2f31 100644 --- a/src/forge/Newfile/UserSubmitComponent.js +++ b/src/forge/Newfile/UserSubmitComponent.js @@ -23,7 +23,7 @@ class UserSubmitComponent extends Component{ // 提交变更 subMitFrom=()=>{ const { current_user , filepath , content } = this.props; - const { branch , projectsId , author } = this.props.match.params; + const { branch , projectsId } = this.props.match.params; const { submitType } = this.state; let path = filepath.substr(1); this.props.form.validateFieldsAndScroll((err, values) => { @@ -37,7 +37,7 @@ class UserSubmitComponent extends Component{ message:values.desc }).then((result)=>{ if(result && result.data.name){ - this.props.history.push(`/projects/${projectsId}/${author}/coders`); + this.props.history.push(`/projects/${projectsId}/coders`); } }).catch(error=>{ console.log(error); diff --git a/src/forge/Order/CopyDetail.js b/src/forge/Order/CopyDetail.js index 3a31c3dd0..4322bdd3d 100644 --- a/src/forge/Order/CopyDetail.js +++ b/src/forge/Order/CopyDetail.js @@ -109,7 +109,7 @@ class CopyDetail extends Component{ //删除工单 deleteorder=(id)=>{ - const { projectsId , orderId , author} = this.props.match.params; + const { projectsId , orderId } = this.props.match.params; const url = `/projects/${projectsId}/issues/${orderId}.json`; axios.delete(url,{ data: { project_id: projectsId, @@ -117,7 +117,7 @@ class CopyDetail extends Component{ } }).then((result)=>{ if(result){ - this.props.history.push(`/projects/${projectsId}/${author}/orders`); + this.props.history.push(`/projects/${projectsId}/orders`); } }).catch((error)=>{ console.log(error); @@ -157,9 +157,9 @@ class CopyDetail extends Component{ const { fileList } = this.state; this.props.form.validateFieldsAndScroll((err, values) => { if(!err){ - const { projectsId , orderId , author } = this.props.match.params; + const { projectsId , orderId } = this.props.match.params; const { subject } = this.state; - const url = `/projects/${projectsId}/${author}/issues/${orderId}.json`; + const url = `/projects/${projectsId}/issues/${orderId}.json`; if(values.issue_tag_ids===0){ values.issue_tag_ids = "" }else{ @@ -185,7 +185,7 @@ class CopyDetail extends Component{ ...values }).then(result=>{ if(result){ - this.props.history.push(`/projects/${projectsId}/${author}/orders`); + this.props.history.push(`/projects/${projectsId}/orders`); } }).catch(error=>{ console.log(error); @@ -197,7 +197,7 @@ class CopyDetail extends Component{ render(){ - const { projectsId , orderId , author } = this.props.match.params; + const { projectsId , orderId } = this.props.match.params; const { getFieldDecorator } = this.props.form; const { current_user } = this.props; const { issue_tag_ids , fixed_version_id , branch_name , status_id , tracker_id , issue_type ,assigned_to_id , priority_id , done_ratio, @@ -259,7 +259,7 @@ class CopyDetail extends Component{

    保存 - 取消

    diff --git a/src/forge/Order/Detail.js b/src/forge/Order/Detail.js index ecbf0ead1..980063f0e 100644 --- a/src/forge/Order/Detail.js +++ b/src/forge/Order/Detail.js @@ -144,7 +144,7 @@ class Detail extends Component{ //删除工单信息 deletedetail=(id)=>{ - const { projectsId , orderId , author } = this.props.match.params; + const { projectsId , orderId } = this.props.match.params; const url = `/projects/${projectsId}/issues/${orderId}.json`; axios.delete(url,{ data: { project_id: projectsId, @@ -152,7 +152,7 @@ class Detail extends Component{ } }).then((result)=>{ if(result){ - this.props.history.push(`/projects/${projectsId}/${author}/orders`); + this.props.history.push(`/projects/${projectsId}/orders`); } }).catch((error)=>{ console.log(error); @@ -269,14 +269,14 @@ class Detail extends Component{ //复制 copydetail=()=>{ - const {projectsId , orderId , author} = this.props.match.params; + const {projectsId , orderId} = this.props.match.params; const url = `/projects/${projectsId}/issues/${orderId}/copy.json`; axios.post(url,{ project_id:projectsId, id:orderId, }).then(result=>{ if(result){ - this.props.history.push(`/projects/${projectsId}/${author}/orders/${result.data.issue_id}/copyetail`); + this.props.history.push(`/projects/${projectsId}/orders/${result.data.issue_id}/copyetail`); } }).catch(error=>{ console.log(error); @@ -329,7 +329,7 @@ class Detail extends Component{ }; render(){ - const { projectsId , orderId , author} = this.props.match.params; + const { projectsId , orderId } = this.props.match.params; const { data,journalsdata, page, limit, search_count, isSpin, isedit, showFiles , quillValue , quillFlag } = this.state; const { current_user } = this.props; const Paginations = ( @@ -422,7 +422,7 @@ class Detail extends Component{
    @@ -449,7 +449,7 @@ class Detail extends Component{ 删除 - 编辑 + 编辑 : "" diff --git a/src/forge/Order/Milepost.js b/src/forge/Order/Milepost.js index c644f1579..c5639f257 100644 --- a/src/forge/Order/Milepost.js +++ b/src/forge/Order/Milepost.js @@ -146,7 +146,7 @@ class Milepost extends Component{ render(){ const { data , limit , page,openselect,closeselect } = this.state; - const { projectsId , author } = this.props.match.params; + const { projectsId } = this.props.match.params; const menu = ( 到期日从近到远 @@ -181,7 +181,7 @@ class Milepost extends Component{
    - {item.name} + {item.name}
    @@ -217,7 +217,7 @@ class Milepost extends Component{
    - 编辑 + 编辑
    @@ -264,7 +264,7 @@ class Milepost extends Component{
    diff --git a/src/forge/Order/UpdateMilepost.js b/src/forge/Order/UpdateMilepost.js index f1fe9de48..3dc93f8a9 100644 --- a/src/forge/Order/UpdateMilepost.js +++ b/src/forge/Order/UpdateMilepost.js @@ -68,7 +68,7 @@ class UpdateMilepost extends Component{ submit=()=>{ this.props.form.validateFieldsAndScroll((err, values) => { if(!err){ - const { projectsId , author } = this.props.match.params; + const { projectsId } = this.props.match.params; const { meilid } = this.props.match.params; const url = `/projects/${projectsId}/versions/${meilid}.json`; let time=undefined; @@ -85,7 +85,7 @@ class UpdateMilepost extends Component{ status:'open' }).then(result=>{ if(result){ - this.props.history.push(`/projects/${projectsId}/${author}/orders/Milepost`); + this.props.history.push(`/projects/${projectsId}/orders/Milepost`); } diff --git a/src/forge/Order/newMilepost.js b/src/forge/Order/newMilepost.js index 4a283fa95..2b97ad4e7 100644 --- a/src/forge/Order/newMilepost.js +++ b/src/forge/Order/newMilepost.js @@ -40,7 +40,7 @@ class NewMilepost extends Component{ submit=()=>{ this.props.form.validateFieldsAndScroll((err, values) => { if(!err){ - const { projectsId , author } = this.props.match.params; + const { projectsId } = this.props.match.params; const url = `/projects/${projectsId}/versions`; let time=undefined; if(this.state.selectedValue===undefined){ @@ -56,7 +56,7 @@ class NewMilepost extends Component{ status:'open' }).then(result=>{ if(result){ - this.props.history.push(`/projects/${projectsId}/${author}/orders/Milepost`); + this.props.history.push(`/projects/${projectsId}/orders/Milepost`); } }).catch(error=>{ diff --git a/src/forge/Order/order.js b/src/forge/Order/order.js index 8ff9ba675..ed598c927 100644 --- a/src/forge/Order/order.js +++ b/src/forge/Order/order.js @@ -311,7 +311,7 @@ class order extends Component{ render(){ const { issue_chosen , issues , limit , page , search_count , data , assigned_to_id , author_id , isSpin,openselect,closeselect } = this.state; - const { projectsId , author } = this.props.match.params; + const { projectsId } = this.props.match.params; const menu = ( this.getOption(e)}> @@ -338,7 +338,7 @@ class order extends Component{