diff --git a/module/common/lang/de.php b/module/common/lang/de.php index 08c98ec4fd..1c6a3786c2 100644 --- a/module/common/lang/de.php +++ b/module/common/lang/de.php @@ -373,6 +373,7 @@ $lang->error->companyNotFound = "The domain %s cannot be found!"; $lang->error->length = array("『%s』Length Error. It should be『%s』", "『%s』length should be <=『%s』and >『%s』."); $lang->error->reg = "『%s』Format Error. It should be『%s』."; $lang->error->unique = "『%s』『%s』existed. Please go to Admin->System->Data->Recycle to restore it, if you are sure it is deleted."; +$lang->error->repeat = "『%s』『%s』exists."; $lang->error->gt = "『%s』should be >『%s』."; $lang->error->ge = "『%s』should be >=『%s』."; $lang->error->lt = "『%s』should be <『%s』。"; diff --git a/module/common/lang/en.php b/module/common/lang/en.php index 66ec104c45..44cd85fe22 100644 --- a/module/common/lang/en.php +++ b/module/common/lang/en.php @@ -373,6 +373,7 @@ $lang->error->companyNotFound = "The domain %s cannot be found!"; $lang->error->length = array("『%s』length error. It should be『%s』", "『%s』length should be <=『%s』and >『%s』."); $lang->error->reg = "『%s』format error. It should be『%s』."; $lang->error->unique = "『%s』『%s』exists. Go to Admin->System->Data->Recycle Bin to restore it, if you are sure it is deleted."; +$lang->error->repeat = "『%s』『%s』exists."; $lang->error->gt = "『%s』should be >『%s』."; $lang->error->ge = "『%s』should be >=『%s』."; $lang->error->lt = "『%s』should be <『%s』。"; diff --git a/module/common/lang/fr.php b/module/common/lang/fr.php index 7007d61b66..35aef6f5fc 100644 --- a/module/common/lang/fr.php +++ b/module/common/lang/fr.php @@ -373,6 +373,7 @@ $lang->error->companyNotFound = "Le domaine %s ne peut être trouvé !"; $lang->error->length = array("『 %s 』erreur de longueur. Il devrait être『%s』", "La longueur de 『%s』devrait être <=『%s』et >『%s』."); $lang->error->reg = "『 %s 』erreur de format. Il devrait être『%s』."; $lang->error->unique = "『 %s 』『 %s 』existes. Allez à Admin->System->Data->Recycle Bin pour le restaurer, si vous êtes sûr qu'il est supprimé."; +$lang->error->repeat = "『 %s 』『 %s 』existes."; $lang->error->gt = "『 %s 』devrait être > 『 %s 』."; $lang->error->ge = "『 %s 』devrait être >= 『 %s 』."; $lang->error->lt = "『%s』should be <『%s』。"; diff --git a/module/common/lang/zh-cn.php b/module/common/lang/zh-cn.php index e303e4b881..b56b7e3fea 100644 --- a/module/common/lang/zh-cn.php +++ b/module/common/lang/zh-cn.php @@ -373,6 +373,7 @@ $lang->error->companyNotFound = "您访问的域名 %s 没有对应的公司。" $lang->error->length = array("『%s』长度错误,应当为『%s』", "『%s』长度应当不超过『%s』,且大于『%s』。"); $lang->error->reg = "『%s』不符合格式,应当为:『%s』。"; $lang->error->unique = "『%s』已经有『%s』这条记录了。如果您确定该记录已删除,请到后台-系统-数据-回收站还原。"; +$lang->error->repeat = "『%s』已经有『%s』这条记录了。"; $lang->error->gt = "『%s』应当大于『%s』。"; $lang->error->ge = "『%s』应当不小于『%s』。"; $lang->error->lt = "『%s』应当小于『%s』。"; diff --git a/module/execution/model.php b/module/execution/model.php index fba531ff94..a664c17ad8 100644 --- a/module/execution/model.php +++ b/module/execution/model.php @@ -391,6 +391,7 @@ class executionModel extends model $this->lang->project->code = $this->lang->execution->execCode; } + $this->lang->error->unique = $this->lang->error->repeat; $sprintProject = isset($sprint->project) ? $sprint->project : '0'; $this->dao->insert(TABLE_EXECUTION)->data($sprint) ->autoCheck($skipFields = 'begin,end') @@ -540,6 +541,7 @@ class executionModel extends model } /* Update data. */ + $this->lang->error->unique = $this->lang->error->repeat; $executionProject = isset($execution->project) ? $execution->project : '0'; $this->dao->update(TABLE_EXECUTION)->data($execution) ->autoCheck($skipFields = 'begin,end') diff --git a/module/group/control.php b/module/group/control.php index ffb2052000..e3a4ea2e33 100644 --- a/module/group/control.php +++ b/module/group/control.php @@ -91,6 +91,7 @@ class group extends control if(!empty($_POST)) { $this->group->update($groupID); + if(dao::isError()) return print(js::error(dao::getError())); if(isonlybody()) return print(js::closeModal('parent.parent', 'this')); return print(js::locate($this->createLink('group', 'browse'), 'parent')); } diff --git a/module/group/lang/de.php b/module/group/lang/de.php index 9deaa69598..4c5500747c 100644 --- a/module/group/lang/de.php +++ b/module/group/lang/de.php @@ -46,6 +46,7 @@ $lang->group->group = 'Group'; $lang->group->more = 'More'; $lang->group->allCheck = 'All'; $lang->group->noGroup = 'No group'; +$lang->group->repeat = "『%s』『%s』exists.Please adjust it and try again."; global $config; if($config->systemMode == 'new') $lang->group->noneProject = 'No Project'; diff --git a/module/group/lang/en.php b/module/group/lang/en.php index 86ffacb8fa..70e4659fb5 100644 --- a/module/group/lang/en.php +++ b/module/group/lang/en.php @@ -46,6 +46,7 @@ $lang->group->group = 'Group'; $lang->group->more = 'More'; $lang->group->allCheck = 'All'; $lang->group->noGroup = 'No group'; +$lang->group->repeat = "『%s』『%s』exists.Please adjust it and try again."; global $config; if($config->systemMode == 'new') $lang->group->noneProject = 'No Project'; diff --git a/module/group/lang/fr.php b/module/group/lang/fr.php index 4dcbd75943..f4cdf89881 100644 --- a/module/group/lang/fr.php +++ b/module/group/lang/fr.php @@ -46,6 +46,7 @@ $lang->group->group = 'Group'; $lang->group->more = 'More'; $lang->group->allCheck = 'All'; $lang->group->noGroup = 'Aucun groupe'; +$lang->group->repeat = "『%s』『%s』exists.Please adjust it and try again."; global $config; if($config->systemMode == 'new') $lang->group->noneProject = 'No Project'; diff --git a/module/group/lang/zh-cn.php b/module/group/lang/zh-cn.php index 7f1da7924f..9559c806b7 100644 --- a/module/group/lang/zh-cn.php +++ b/module/group/lang/zh-cn.php @@ -46,6 +46,7 @@ $lang->group->group = '分组'; $lang->group->more = '更多'; $lang->group->allCheck = '全部'; $lang->group->noGroup = '暂时没有分组。'; +$lang->group->repeat = "『%s』已经有『%s』这条记录了,请调整后再试。"; global $config; if($config->systemMode == 'new') $lang->group->noneProject = '暂时没有项目'; diff --git a/module/group/model.php b/module/group/model.php index ca6fcd8ae4..b9cfd0ba1c 100644 --- a/module/group/model.php +++ b/module/group/model.php @@ -27,7 +27,8 @@ class groupModel extends model unset($group->limited); $group->role = 'limited'; } - $this->dao->insert(TABLE_GROUP)->data($group)->batchCheck($this->config->group->create->requiredFields, 'notempty')->exec(); + $this->lang->error->unique = $this->lang->group->repeat; + $this->dao->insert(TABLE_GROUP)->data($group)->batchCheck($this->config->group->create->requiredFields, 'notempty')->check('name', 'unique')->exec(); return $this->dao->lastInsertId(); } @@ -41,7 +42,8 @@ class groupModel extends model public function update($groupID) { $group = fixer::input('post')->get(); - return $this->dao->update(TABLE_GROUP)->data($group)->batchCheck($this->config->group->edit->requiredFields, 'notempty')->where('id')->eq($groupID)->exec(); + $this->lang->error->unique = $this->lang->group->repeat; + return $this->dao->update(TABLE_GROUP)->data($group)->batchCheck($this->config->group->edit->requiredFields, 'notempty')->check('name', 'unique', "id != {$groupID}")->where('id')->eq($groupID)->exec(); } /** @@ -54,6 +56,7 @@ class groupModel extends model public function copy($groupID) { $group = fixer::input('post')->remove('options')->get(); + $this->lang->error->unique = $this->lang->group->repeat; $this->dao->insert(TABLE_GROUP)->data($group)->check('name', 'unique')->check('name', 'notempty')->exec(); if($this->post->options == false) return; if(!dao::isError()) @@ -315,9 +318,9 @@ class groupModel extends model /** * Get admins by object id list. - * - * @param int $idList - * @param string $field + * + * @param int $idList + * @param string $field * @access public * @return void */ diff --git a/module/product/model.php b/module/product/model.php index 43e1d0f115..546770dae9 100644 --- a/module/product/model.php +++ b/module/product/model.php @@ -671,6 +671,7 @@ class productModel extends model ->remove('uid,newLine,lineName,contactListMenu') ->get(); + $this->lang->error->unique = $this->lang->error->repeat; $product = $this->loadModel('file')->processImgURL($product, $this->config->product->editor->create['id'], $this->post->uid); $programID = isset($product->program) ? $product->program : 0; $this->dao->insert(TABLE_PRODUCT)->data($product)->autoCheck() @@ -763,6 +764,7 @@ class productModel extends model ->remove('uid,changeProjects,contactListMenu') ->get(); + $this->lang->error->unique = $this->lang->error->repeat; $product = $this->loadModel('file')->processImgURL($product, $this->config->product->editor->edit['id'], $this->post->uid); $programID = isset($product->program) ? $product->program : ''; $this->dao->update(TABLE_PRODUCT)->data($product)->autoCheck() diff --git a/module/program/model.php b/module/program/model.php index 64cce62d4a..84eef5815d 100644 --- a/module/program/model.php +++ b/module/program/model.php @@ -753,6 +753,7 @@ class programModel extends model if(isset($this->lang->program->$field)) $this->lang->project->$field = $this->lang->program->$field; } + $this->lang->error->unique = $this->lang->error->repeat; $program = $this->loadModel('file')->processImgURL($program, $this->config->program->editor->create['id'], $this->post->uid); $this->dao->insert(TABLE_PROGRAM)->data($program) ->autoCheck() @@ -860,6 +861,7 @@ class programModel extends model if(isset($this->lang->program->$field)) $this->lang->project->$field = $this->lang->program->$field; } + $this->lang->error->unique = $this->lang->error->repeat; $this->dao->update(TABLE_PROGRAM)->data($program) ->autoCheck($skipFields = 'begin,end') ->batchcheck($this->config->program->edit->requiredFields, 'notempty') diff --git a/module/project/model.php b/module/project/model.php index 784f29d7eb..fff3a0fe4a 100644 --- a/module/project/model.php +++ b/module/project/model.php @@ -1190,6 +1190,7 @@ class projectModel extends model if(isset($this->lang->project->$field)) $this->lang->project->$field = $this->lang->project->$field; } + $this->lang->error->unique = $this->lang->error->repeat; $project = $this->loadModel('file')->processImgURL($project, $this->config->project->editor->create['id'], $this->post->uid); $this->dao->insert(TABLE_PROJECT)->data($project) ->autoCheck() @@ -1436,6 +1437,7 @@ class projectModel extends model if(isset($this->lang->project->$field)) $this->lang->project->$field = $this->lang->project->$field; } + $this->lang->error->unique = $this->lang->error->repeat; $this->dao->update(TABLE_PROJECT)->data($project) ->autoCheck($skipFields = 'begin,end') ->batchcheck($requiredFields, 'notempty') diff --git a/module/user/model.php b/module/user/model.php index 8afd9f4677..404f016840 100644 --- a/module/user/model.php +++ b/module/user/model.php @@ -398,7 +398,7 @@ class userModel extends model $users = fixer::input('post')->get(); $data = array(); $accounts = array(); - for($i = 1; $i < $this->config->user->batchCreate; $i++) + for($i = 1; $i <= $this->config->user->batchCreate; $i++) { $users->account[$i] = trim($users->account[$i]); if($users->account[$i] != '')