From 9cbec051b230ec67e17a480c4837537875585dba Mon Sep 17 00:00:00 2001 From: qiyu-xie Date: Thu, 10 Dec 2020 14:50:06 +0800 Subject: [PATCH] * Check product name when create project. --- module/program/lang/de.php | 3 ++- module/program/lang/en.php | 3 ++- module/program/lang/fr.php | 3 ++- module/program/lang/vi.php | 3 ++- module/program/lang/zh-cn.php | 1 + module/program/lang/zh-tw.php | 3 ++- module/program/model.php | 7 +++++++ 7 files changed, 18 insertions(+), 5 deletions(-) diff --git a/module/program/lang/de.php b/module/program/lang/de.php index 2155fcef32..03fad43d91 100644 --- a/module/program/lang/de.php +++ b/module/program/lang/de.php @@ -89,7 +89,8 @@ $lang->program->cv = 'CV%'; $lang->program->PRJTeamCount = 'Team'; $lang->program->PRJLongTime = 'Long-Term Project'; -$lang->program->productNotEmpty = 'Please link products or create products.'; +$lang->program->productNotEmpty = 'Please link products or create products.'; +$lang->program->existProductName = 'Product name already exists.'; $lang->program->unitList[''] = ''; $lang->program->unitList['yuan'] = 'Yuan'; diff --git a/module/program/lang/en.php b/module/program/lang/en.php index da9b51a290..cea30a09e0 100644 --- a/module/program/lang/en.php +++ b/module/program/lang/en.php @@ -89,7 +89,8 @@ $lang->program->cv = 'CV%'; $lang->program->PRJTeamCount = 'Team'; $lang->program->PRJLongTime = 'Long-Term Project'; -$lang->program->productNotEmpty = 'Please link products or create products.'; +$lang->program->productNotEmpty = 'Please link products or create products.'; +$lang->program->existProductName = 'Product name already exists.'; $lang->program->unitList[''] = ''; $lang->program->unitList['yuan'] = 'Yuan'; diff --git a/module/program/lang/fr.php b/module/program/lang/fr.php index 2155fcef32..03fad43d91 100644 --- a/module/program/lang/fr.php +++ b/module/program/lang/fr.php @@ -89,7 +89,8 @@ $lang->program->cv = 'CV%'; $lang->program->PRJTeamCount = 'Team'; $lang->program->PRJLongTime = 'Long-Term Project'; -$lang->program->productNotEmpty = 'Please link products or create products.'; +$lang->program->productNotEmpty = 'Please link products or create products.'; +$lang->program->existProductName = 'Product name already exists.'; $lang->program->unitList[''] = ''; $lang->program->unitList['yuan'] = 'Yuan'; diff --git a/module/program/lang/vi.php b/module/program/lang/vi.php index 2155fcef32..03fad43d91 100644 --- a/module/program/lang/vi.php +++ b/module/program/lang/vi.php @@ -89,7 +89,8 @@ $lang->program->cv = 'CV%'; $lang->program->PRJTeamCount = 'Team'; $lang->program->PRJLongTime = 'Long-Term Project'; -$lang->program->productNotEmpty = 'Please link products or create products.'; +$lang->program->productNotEmpty = 'Please link products or create products.'; +$lang->program->existProductName = 'Product name already exists.'; $lang->program->unitList[''] = ''; $lang->program->unitList['yuan'] = 'Yuan'; diff --git a/module/program/lang/zh-cn.php b/module/program/lang/zh-cn.php index 073a623fa8..10dad35c3e 100644 --- a/module/program/lang/zh-cn.php +++ b/module/program/lang/zh-cn.php @@ -91,6 +91,7 @@ $lang->program->PRJTeamCount = '项目成员'; $lang->program->PRJLongTime = '长期'; $lang->program->productNotEmpty = '请关联产品或创建产品。'; +$lang->program->existProductName = '产品名称已存在。'; $lang->program->unitList[''] = ''; $lang->program->unitList['yuan'] = '元'; diff --git a/module/program/lang/zh-tw.php b/module/program/lang/zh-tw.php index f35bd7ae9c..cafce397f4 100644 --- a/module/program/lang/zh-tw.php +++ b/module/program/lang/zh-tw.php @@ -91,7 +91,8 @@ $lang->program->cv = 'CV%'; $lang->program->PRJTeamCount = '項目成員'; $lang->program->PRJLongTime = '長期'; -$lang->program->productNotEmpty = '請關聯產品或創建產品。'; +$lang->program->productNotEmpty = '請關聯產品或創建產品。'; +$lang->program->existProductName = '產品名稱已存在。'; $lang->program->unitList[''] = ''; $lang->program->unitList['yuan'] = '元'; diff --git a/module/program/model.php b/module/program/model.php index 2a23a1915b..95499d9001 100644 --- a/module/program/model.php +++ b/module/program/model.php @@ -1244,6 +1244,13 @@ class programModel extends model return false; } + $existProductName = $this->dao->select('name')->from(TABLE_PRODUCT)->where('name')->eq($_POST['productName'])->fetch('name'); + if(!empty($existProductName)) + { + dao::$errors[] = $this->lang->program->existProductName; + return false; + } + $requiredFields = $this->config->program->PRJCreate->requiredFields; if($this->post->delta == 999) $requiredFields = trim(str_replace(',end,', ',', ",{$requiredFields},"), ',');