From 7c540be4d75d551a54d6366b1be571e51538b348 Mon Sep 17 00:00:00 2001 From: sunjun Date: Fri, 8 Apr 2022 09:37:49 +0800 Subject: [PATCH 1/3] *Fixbug_sunjun_17344 --- module/product/lang/en.php | 1 + module/product/lang/zh-cn.php | 1 + module/product/model.php | 7 +++++++ 3 files changed, 9 insertions(+) diff --git a/module/product/lang/en.php b/module/product/lang/en.php index 5edd2eba56..64bd10635a 100644 --- a/module/product/lang/en.php +++ b/module/product/lang/en.php @@ -90,6 +90,7 @@ $lang->product->confirmChangeProgram = "The projects linked with this {$lang->pr $lang->product->changeProgramError = "The {$lang->SRCommon} of this {$lang->productCommon} has been linked to the project, please unlink it before proceeding"; $lang->product->programEmpty = 'Program should not be empty!'; $lang->product->nameIsDuplicate = "『%s』 product line already exists, please reset!"; +$lang->product->nameIsDuplicated = "『%s』『%s』 exists. Go to Admin->System->Data->Recycle Bin to restore it, if you are sure it is deleted."; $lang->product->id = 'ID'; $lang->product->program = "Program"; diff --git a/module/product/lang/zh-cn.php b/module/product/lang/zh-cn.php index 92d00b16d6..d5cea6673b 100644 --- a/module/product/lang/zh-cn.php +++ b/module/product/lang/zh-cn.php @@ -90,6 +90,7 @@ $lang->product->confirmChangeProgram = "如下项目既关联了该{$lang->produ $lang->product->changeProgramError = "该{$lang->productCommon}的{$lang->SRCommon}已经关联到项目，请取消关联后再操作"; $lang->product->programEmpty = '项目集不能为空'; $lang->product->nameIsDuplicate = "『%s』产品线已经存在，请重新设置！"; +$lang->product->nameIsDuplicated = "『%s』已经有『%s』这条记录了。如果您确定该记录已删除，请到后台-系统-数据-回收站还原。"; $lang->product->id = '编号'; $lang->product->program = "所属项目集"; diff --git a/module/product/model.php b/module/product/model.php index 187d63d63d..c115f72574 100644 --- a/module/product/model.php +++ b/module/product/model.php @@ -622,6 +622,13 @@ class productModel extends model $line->name = $this->post->lineName; $line->root = $this->config->systemMode == 'new' ? $product->program : 0; $line->order = $maxOrder; + + $lines = $this->dao->select('name')->from(TABLE_MODULE)->where('type')->eq('line')->andWhere('root')->eq($line->root)->andWhere('name')->eq($line->name)->fetch(); + if(!empty($lines)) + { + dao::$errors['lineName'] = sprintf($this->lang->product->nameIsDuplicated, $this->lang->product->line, $line->name); + return false; + } $this->dao->insert(TABLE_MODULE)->data($line)->exec(); if(!dao::isError()) From 95b2c3317a8d1b61d16dfae2658f0725e7db831a Mon Sep 17 00:00:00 2001 From: sunjun Date: Fri, 8 Apr 2022 10:11:16 +0800 Subject: [PATCH 2/3] *Fixbug_sunjun_17344 --- module/product/lang/en.php | 2 +- module/product/lang/zh-cn.php | 2 +- module/product/model.php | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/module/product/lang/en.php b/module/product/lang/en.php index 64bd10635a..8372c8c887 100644 --- a/module/product/lang/en.php +++ b/module/product/lang/en.php @@ -90,7 +90,7 @@ $lang->product->confirmChangeProgram = "The projects linked with this {$lang->pr $lang->product->changeProgramError = "The {$lang->SRCommon} of this {$lang->productCommon} has been linked to the project, please unlink it before proceeding"; $lang->product->programEmpty = 'Program should not be empty!'; $lang->product->nameIsDuplicate = "『%s』 product line already exists, please reset!"; -$lang->product->nameIsDuplicated = "『%s』『%s』 exists. Go to Admin->System->Data->Recycle Bin to restore it, if you are sure it is deleted."; +$lang->product->nameIsDuplicated = "『Product Line』『%s』 exists. Go to Admin->System->Data->Recycle Bin to restore it, if you are sure it is deleted."; $lang->product->id = 'ID'; $lang->product->program = "Program"; diff --git a/module/product/lang/zh-cn.php b/module/product/lang/zh-cn.php index d5cea6673b..5610157e88 100644 --- a/module/product/lang/zh-cn.php +++ b/module/product/lang/zh-cn.php @@ -90,7 +90,7 @@ $lang->product->confirmChangeProgram = "如下项目既关联了该{$lang->produ $lang->product->changeProgramError = "该{$lang->productCommon}的{$lang->SRCommon}已经关联到项目，请取消关联后再操作"; $lang->product->programEmpty = '项目集不能为空'; $lang->product->nameIsDuplicate = "『%s』产品线已经存在，请重新设置！"; -$lang->product->nameIsDuplicated = "『%s』已经有『%s』这条记录了。如果您确定该记录已删除，请到后台-系统-数据-回收站还原。"; +$lang->product->nameIsDuplicated = "『产品线』已经有『%s』这条记录了。如果您确定该记录已删除，请到后台-系统-数据-回收站还原。"; $lang->product->id = '编号'; $lang->product->program = "所属项目集"; diff --git a/module/product/model.php b/module/product/model.php index c115f72574..a45425cd51 100644 --- a/module/product/model.php +++ b/module/product/model.php @@ -626,7 +626,7 @@ class productModel extends model $lines = $this->dao->select('name')->from(TABLE_MODULE)->where('type')->eq('line')->andWhere('root')->eq($line->root)->andWhere('name')->eq($line->name)->fetch(); if(!empty($lines)) { - dao::$errors['lineName'] = sprintf($this->lang->product->nameIsDuplicated, $this->lang->product->line, $line->name); + dao::$errors['lineName'] = sprintf($this->lang->product->nameIsDuplicated, $line->name); return false; } $this->dao->insert(TABLE_MODULE)->data($line)->exec(); From 854da450be51a4253266dd851913ecdd3c58ccca Mon Sep 17 00:00:00 2001 From: sunjun Date: Fri, 8 Apr 2022 10:58:29 +0800 Subject: [PATCH 3/3] *Fixbug_sunjun_17344 --- module/product/lang/en.php | 2 +- module/product/lang/zh-cn.php | 2 +- module/product/view/browse.html.php | 1 - 3 files changed, 2 insertions(+), 3 deletions(-) diff --git a/module/product/lang/en.php b/module/product/lang/en.php index 8372c8c887..90fc7bf5a0 100644 --- a/module/product/lang/en.php +++ b/module/product/lang/en.php @@ -90,7 +90,7 @@ $lang->product->confirmChangeProgram = "The projects linked with this {$lang->pr $lang->product->changeProgramError = "The {$lang->SRCommon} of this {$lang->productCommon} has been linked to the project, please unlink it before proceeding"; $lang->product->programEmpty = 'Program should not be empty!'; $lang->product->nameIsDuplicate = "『%s』 product line already exists, please reset!"; -$lang->product->nameIsDuplicated = "『Product Line』『%s』 exists. Go to Admin->System->Data->Recycle Bin to restore it, if you are sure it is deleted."; +$lang->product->nameIsDuplicated = "Product Line『%s』 exists. Go to Admin->System->Data->Recycle Bin to restore it, if you are sure it is deleted."; $lang->product->id = 'ID'; $lang->product->program = "Program"; diff --git a/module/product/lang/zh-cn.php b/module/product/lang/zh-cn.php index 5610157e88..e45df85ce8 100644 --- a/module/product/lang/zh-cn.php +++ b/module/product/lang/zh-cn.php @@ -90,7 +90,7 @@ $lang->product->confirmChangeProgram = "如下项目既关联了该{$lang->produ $lang->product->changeProgramError = "该{$lang->productCommon}的{$lang->SRCommon}已经关联到项目，请取消关联后再操作"; $lang->product->programEmpty = '项目集不能为空'; $lang->product->nameIsDuplicate = "『%s』产品线已经存在，请重新设置！"; -$lang->product->nameIsDuplicated = "『产品线』已经有『%s』这条记录了。如果您确定该记录已删除，请到后台-系统-数据-回收站还原。"; +$lang->product->nameIsDuplicated = "产品线已经有『%s』这条记录了。如果您确定该记录已删除，请到后台-系统-数据-回收站还原。"; $lang->product->id = '编号'; $lang->product->program = "所属项目集"; diff --git a/module/product/view/browse.html.php b/module/product/view/browse.html.php index 15a4aa1e81..53846d109b 100644 --- a/module/product/view/browse.html.php +++ b/module/product/view/browse.html.php @@ -583,7 +583,6 @@ $projectIDParam = $isProjectStory ? "projectID=$projectID&" : ''; story->importToLib, '', 'class="btn" data-toggle="modal" id="importToLib"');?> -
show('right', 'pagerjs');?>