* finish task #70196.

This commit is contained in:
wangyidong
2022-09-26 13:15:48 +08:00
parent 685799b216
commit 0ba479e9e5
8 changed files with 12 additions and 56 deletions
+11
View File
@@ -1598,6 +1598,17 @@ class programModel extends model
*/
public function createDefaultProgram()
{
$defaultProgram = $this->loadModel('setting')->getItem('owner=system&module=common&section=global&key=defaultProgram');
if($defaultProgram)
{
$programID = $defaultProgram->value;
$program = $this->dao->select('id')->from(TABLE_PROGRAM)->where('id')->eq($programID)->andWhere('deleted')->eq(0)->fetch();
if($program) return $programID;
}
$program = $this->dao->select('id')->from(TABLE_PROGRAM)->where('name')->eq($this->lang->program->defaultProgram)->andWhere('deleted')->eq(0)->fetch();
if($program) return $program->id;
$account = isset($this->app->user->account) ? $this->app->user->account : '';
$minBegin = $this->dao->select('min(begin) as min')->from(TABLE_PROJECT)->where('deleted')->eq(0)->fetch('min');
+1 -9
View File
@@ -111,9 +111,6 @@ class task extends control
$this->view->lanePairs = $lanePairs;
}
/* Set menu. */
$this->execution->setMenu($execution->id);
if(!empty($_POST))
{
$response['result'] = 'success';
@@ -512,6 +509,7 @@ class task extends control
/* Set menu. */
$this->execution->setMenu($this->view->execution->id);
if($this->app->tab == 'project') $this->loadModel('project')->setMenu($this->session->project);
$this->view->position[] = html::a($this->createLink('execution', 'browse', "execution={$this->view->task->execution}"), $this->view->execution->name);
}
@@ -600,8 +598,6 @@ class task extends control
}
}
if($this->app->tab == 'project') $this->loadModel('project')->setMenu($this->session->project);
$tasks = $this->task->getParentTaskPairs($this->view->execution->id, $this->view->task->parent);
if(isset($tasks[$taskID])) unset($tasks[$taskID]);
@@ -924,7 +920,6 @@ class task extends control
$this->session->set('executionList', $this->app->getURI(true), 'execution');
$this->commonAction($taskID);
if($this->app->tab == 'project') $this->loadModel('project')->setMenu($this->session->project);
$taskID = (int)$taskID;
$task = $this->task->getById($taskID, true);
@@ -963,9 +958,6 @@ class task extends control
/* Update action. */
if($task->assignedTo == $this->app->user->account) $this->loadModel('action')->read('task', $taskID);
/* Set menu. */
if($this->app->tab == 'execution') $this->execution->setMenu($execution->id);
$this->executeHooks($taskID);
$title = "TASK#$task->id $task->name / $execution->name";
-1
View File
@@ -63,7 +63,6 @@ $lang->upgrade->toMAXGuide = 'ZenTao ultimate version upgrade';
$lang->upgrade->line = 'Product Line';
$lang->upgrade->allLines = "All Product Lines";
$lang->upgrade->program = 'Merge Project';
$lang->upgrade->defaultProgram = 'Default Program';
$lang->upgrade->existProgram = 'Existing programs';
$lang->upgrade->existProject = 'Existing projects';
$lang->upgrade->existLine = 'Existing' . $lang->productCommon . ' lines';
-1
View File
@@ -63,7 +63,6 @@ $lang->upgrade->toMAXGuide = 'ZenTao ultimate version upgrade';
$lang->upgrade->line = 'Product Line';
$lang->upgrade->allLines = "All Product Lines";
$lang->upgrade->program = 'Merge Project';
$lang->upgrade->defaultProgram = 'Default Program';
$lang->upgrade->existProgram = 'Existing programs';
$lang->upgrade->existProject = 'Existing projects';
$lang->upgrade->existLine = 'Existing' . $lang->productCommon . ' lines';
-1
View File
@@ -63,7 +63,6 @@ $lang->upgrade->toMAXGuide = 'ZenTao ultimate version upgrade';
$lang->upgrade->line = 'Product Line';
$lang->upgrade->allLines = "All Product Lines";
$lang->upgrade->program = 'Merge Project';
$lang->upgrade->defaultProgram = 'Default Program';
$lang->upgrade->existProgram = 'Existing programs';
$lang->upgrade->existProject = 'Existing projects';
$lang->upgrade->existLine = 'Existing' . $lang->productCommon . ' lines';
-1
View File
@@ -61,7 +61,6 @@ $lang->upgrade->toMAXGuide = 'ZenTao ultimate version upgrade';
$lang->upgrade->line = 'Product Line';
$lang->upgrade->allLines = "All Product Lines";
$lang->upgrade->program = 'Merge Project';
$lang->upgrade->defaultProgram = 'Default Program';
$lang->upgrade->existProgram = 'Existing programs';
$lang->upgrade->existProject = 'Existing projects';
$lang->upgrade->existLine = 'Existing' . $lang->productCommon . ' lines';
-1
View File
@@ -63,7 +63,6 @@ $lang->upgrade->toMAXGuide = '禅道旗舰版版本升级';
$lang->upgrade->line = '产品线';
$lang->upgrade->allLines = "所有{$lang->productCommon}线";
$lang->upgrade->program = '目标项目集和项目';
$lang->upgrade->defaultProgram = '默认项目集';
$lang->upgrade->existProgram = '已有项目集';
$lang->upgrade->existProject = '已有项目';
$lang->upgrade->existLine = '已有' . $lang->productCommon . '线';
-42
View File
@@ -7546,48 +7546,6 @@ class upgradeModel extends model
return !dao::isError();
}
/**
* Create a default program.
*
* @access public
* @return object
*/
public function createDefaultProgram()
{
$program = $this->dao->select('*')->from(TABLE_PROGRAM)->where('name')->eq($this->lang->upgrade->defaultProgram)->fetch();
if($program) return $program;
$account = isset($this->app->user->account) ? $this->app->user->account : '';
$program = new stdclass();
$program->name = $this->lang->upgrade->defaultProgram;
$program->type = 'program';
$program->status = 'doing';
$program->begin = helper::now();
$program->end = LONG_TIME;
$program->openedBy = $account;
$program->openedDate = helper::now();
$program->openedVersion = $this->config->version;
$program->acl = 'open';
$program->days = $this->computeDaysDelta($program->begin, $program->end);
$program->grade = 1;
$program->vision = 'rnd';
$this->app->loadLang('program');
$this->app->loadLang('project');
$this->lang->project->name = $this->lang->program->name;
$this->dao->insert(TABLE_PROGRAM)->data($program)->exec();
if(dao::isError()) return false;
$programID = $this->dao->lastInsertId();
$this->dao->update(TABLE_PROGRAM)->set('path')->eq(",{$programID},")->set('`order`')->eq($programID * 5)->where('id')->eq($programID)->exec();
$this->loadModel('action')->create('program', $programID, 'openedbysystem');
return $this->loadModel('program')->getByID($programID);
}
/**
* Historical projects are upgraded by project.
*