From 36dd0b9ad57513d39ec6894d877498d6d7acba00 Mon Sep 17 00:00:00 2001 From: wangyidong Date: Tue, 26 Jul 2022 13:11:32 +0800 Subject: [PATCH] * adjust for task #61977. --- module/programplan/model.php | 21 +++++++++++++++++++-- module/project/lang/zh-cn.php | 2 +- 2 files changed, 20 insertions(+), 3 deletions(-) diff --git a/module/programplan/model.php b/module/programplan/model.php index efb5b8c6ea..557fc9c475 100755 --- a/module/programplan/model.php +++ b/module/programplan/model.php @@ -433,8 +433,7 @@ class programplanModel extends model $parentACL = $parentStage->acl; } - $names = array_filter($names); - if(count(array_unique($names)) != count($names)) return dao::$errors['message'][] = $this->lang->programplan->error->sameName; + if(!$this->checkNameUnique($names)) return false; $datas = array(); foreach($names as $key => $name) @@ -952,6 +951,24 @@ class programplanModel extends model return true; } + /** + * Check name unique. + * + * @param array $names + * @access public + * @return bool + */ + public function checkNameUnique($names) + { + $names = array_filter($names); + if(count(array_unique($names)) != count($names)) + { + dao::$errors['message'][] = $this->lang->programplan->error->sameName; + return false; + } + return true; + } + /** * Get the stage set to milestone. * diff --git a/module/project/lang/zh-cn.php b/module/project/lang/zh-cn.php index cba58d2b93..2a4bc0aeb5 100644 --- a/module/project/lang/zh-cn.php +++ b/module/project/lang/zh-cn.php @@ -327,4 +327,4 @@ $lang->project->childLongTime = "子项目中有长期项目,父项目 $lang->project->confirmUnlinkMember = "您确定从该项目中移除该用户吗?"; $lang->project->action = new stdclass(); -$lang->project->action->managed = '$date, 由 $actor 维护。$extra' . "\n"; \ No newline at end of file +$lang->project->action->managed = '$date, 由 $actor 维护。$extra' . "\n";