Design/EasySoft-ZenTaoPMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 30 Wiki Activity

* Adjust code style.

Browse Source
This commit is contained in:
tianshujie98
2021-07-14 10:30:19 +08:00
parent 73394d0435
commit 7e13c5544b
7 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/project/model.php
-3
View File
@@ -750,7 +750,6 @@ class projectModel extends model
$this->dao->insert(TABLE_PROJECT)->data($project)
->autoCheck()
->batchcheck($requiredFields, 'notempty')
->checkIF(!empty($project->name), 'name', 'unique', "`type`='project'")
->exec();
/* Add the creater to the team. */
@@ -937,7 +936,6 @@ class projectModel extends model
->checkIF($project->begin != '', 'begin', 'date')
->checkIF($project->end != '', 'end', 'date')
->checkIF($project->end != '', 'end', 'gt', $project->begin)
->check('name', 'unique', "id != $projectID and deleted='0' and `type`='project'")
->where('id')->eq($projectID)
->exec();
@@ -1016,7 +1014,6 @@ class projectModel extends model
->checkIF($project->begin != '', 'begin', 'date')
->checkIF($project->end != '', 'end', 'date')
->checkIF($project->end != '', 'end', 'gt', $project->begin)
->check('name', 'unique', "id NOT " . helper::dbIN($data->projectIdList) . " and deleted='0'")
->where('id')->eq($projectID)
->exec();
module/upgrade/lang/de.php
+1
View File
@@ -115,6 +115,7 @@ $lang->upgrade->dataMethod = 'Data migration method';
$lang->upgrade->begin = 'Begin Date';
$lang->upgrade->end = 'End Date';
$lang->upgrade->selectProject = 'The target project';
$lang->upgrade->projectName = 'Project Name';
$lang->upgrade->newProgram = 'Create';
$lang->upgrade->projectEmpty = 'Project must be not empty.';
module/upgrade/lang/en.php
+1
View File
@@ -102,6 +102,7 @@ $lang->upgrade->dataMethod = 'Data migration method';
$lang->upgrade->begin = 'Begin Date';
$lang->upgrade->end = 'End Date';
$lang->upgrade->selectProject = 'The target project';
$lang->upgrade->projectName = 'Project Name';
$lang->upgrade->newProgram = 'Create';
$lang->upgrade->projectEmpty = 'Project must be not empty.';
module/upgrade/lang/fr.php
+1
View File
@@ -116,6 +116,7 @@ $lang->upgrade->dataMethod = 'Data migration method';
$lang->upgrade->begin = 'Begin Date';
$lang->upgrade->end = 'End Date';
$lang->upgrade->selectProject = 'The target project';
$lang->upgrade->projectName = 'Project Name';
$lang->upgrade->newProgram = 'Create';
$lang->upgrade->projectEmpty = 'Project must be not empty.';
module/upgrade/lang/vi.php
+1
View File
@@ -116,6 +116,7 @@ $lang->upgrade->dataMethod = 'Data migration method';
$lang->upgrade->begin = 'Begin Date';
$lang->upgrade->end = 'End Date';
$lang->upgrade->selectProject = 'The target project';
$lang->upgrade->projectName = 'Project Name';
$lang->upgrade->newProgram = 'Create';
$lang->upgrade->projectEmpty = 'Project must be not empty.';
module/upgrade/lang/zh-cn.php
+1
View File
@@ -103,6 +103,7 @@ $lang->upgrade->dataMethod = '数据迁移方式';
$lang->upgrade->begin = '开始日期';
$lang->upgrade->end = '结束日期';
$lang->upgrade->selectProject = '目标项目';
$lang->upgrade->projectName = '项目名称';
$lang->upgrade->newProgram = '新建';
$lang->upgrade->projectEmpty = '所属项目不能为空！';
module/upgrade/model.php
+2 -2
View File
@@ -4310,7 +4310,7 @@ class upgradeModel extends model
$line->grade = 1;
$line->name = $data->lineName;
$line->root = $programID;
$line->order = $maxOrder;
$line->order = $maxOrder;
$this->dao->insert(TABLE_MODULE)->data($line)->exec();
$lineID = $this->dao->lastInsertID();
$path = ",$lineID,";
@@ -4335,6 +4335,7 @@ class upgradeModel extends model
/* Create a project. */
$this->loadModel('action');
$this->app->loadLang('doc');
$this->lang->project->name = $this->lang->upgrade->projectName;
if($data->projectType == 'execution')
{
/* Use historical projects as execution upgrades. */
@@ -4404,7 +4405,6 @@ class upgradeModel extends model
$this->dao->insert(TABLE_PROJECT)->data($project)
->batchcheck('name', 'notempty')
->check('name', 'unique', "deleted='0' and type = 'project'")
->exec();
if(dao::isError()) return false;