diff --git a/module/program/control.php b/module/program/control.php index cba9ea6364..37641d221f 100644 --- a/module/program/control.php +++ b/module/program/control.php @@ -14,7 +14,6 @@ class program extends control { parent::__construct($moduleName, $methodName); $this->loadModel('project'); - $this->loadModel('programplan'); $this->loadModel('group'); } @@ -685,11 +684,10 @@ class program extends control * @param int $programID * @param string $from PRJ|PGM * @param int $copyProjectID - * @param int $projectID * @access public * @return void */ - public function PRJCreate($model = 'waterfall', $programID = 0, $from = 'PRJ', $copyProjectID = '', $projectID = 0) + public function PRJCreate($model = 'waterfall', $programID = 0, $from = 'PRJ', $copyProjectID = '') { $this->app->loadLang('custom'); if($from == 'PRJ') @@ -702,17 +700,6 @@ class program extends control $this->lang->program->switcherMenu = $this->program->getPGMCommonAction(); } - if($projectID) - { - $this->view->title = $this->lang->program->tips; - $this->view->tips = $this->fetch('program', 'tips', "model=$model&programID=$programID&from=$from&projectID=$projectID"); - $this->view->programID = $programID; - $this->view->from = $from; - $this->view->projectID = $projectID; - $this->display(); - exit; - } - if($_POST) { $projectID = $this->program->PRJCreate(); @@ -720,7 +707,12 @@ class program extends control $this->loadModel('action')->create('project', $projectID, 'opened'); - $this->send(array('result' => 'success', 'message' => $this->lang->saveSuccess, 'locate' => $this->createLink('program', 'PRJCreate', "model=$model&programID=$programID&from=$from©ProjectID=&projectID=$projectID", '', '',$projectID))); + if($from == 'PGM') + { + $this->send(array('result' => 'success', 'message' => $this->lang->saveSuccess, 'locate' => inlink('PGMBrowse'))); + } + $this->send(array('result' => 'success', 'message' => $this->lang->saveSuccess, 'locate' => inlink('PRJBrowse', array('programID' => $programID, 'browseType' => 'all')))); + } $name = ''; @@ -1442,25 +1434,4 @@ class program extends control echo $this->fetch('program', 'PGMProduct', "programID=$programID"); } - - /** - * When create a project, help the user. - * - * @param string $model - * @param int $programID - * @param string $from PRJ|PGM - * @param int $projectID - * @access public - * @return void - */ - public function tips($model = 'waterfall', $programID = 0, $from = 'PRJ', $projectID) - { - $this->view->model = $model; - $this->view->programID = $programID; - $this->view->from = $from; - $this->view->projectID = $projectID; - $this->view->project = $this->project->getById($projectID); - - $this->display('program', 'tips'); - } } diff --git a/module/program/css/prjcreate.css b/module/program/css/prjcreate.css index 8ae721ff62..6400101703 100644 --- a/module/program/css/prjcreate.css +++ b/module/program/css/prjcreate.css @@ -8,4 +8,3 @@ #copyProjectModal a.active:after {position: absolute; content: '\e92f'; font-family: ZentaoIcon; font-size: 20px; right: 25px;} #copyProjectModal a.cancel {color: #ff5d5d} #budget {border-right:0px;} -#tipsModal {margin-top: 10%;} diff --git a/module/program/lang/de.php b/module/program/lang/de.php index 4764bb28ec..341cdba341 100644 --- a/module/program/lang/de.php +++ b/module/program/lang/de.php @@ -38,9 +38,6 @@ $lang->program->errorNoProducts = 'At least one product is associated'; $lang->program->copyNoProject = 'There are no items available to copy.'; $lang->program->PRJSource = 'Project source:'; $lang->program->PRJStandalone = 'Projects that do not belong to a program.'; -$lang->program->tips = 'Note'; -$lang->program->setTeam = 'Set Team'; -$lang->program->goback = 'Go Back'; /* Fields. */ $lang->program->common = 'Program'; @@ -153,7 +150,6 @@ $lang->program->cannotCancelCat = "It has child projects, so you cannot unmark $lang->program->parentBeginEnd = "Parent begin&end date: %s ~ %s"; $lang->program->childLongTime = "If a child as long-term projects, the parent should be long-term too."; $lang->program->readjustTime = 'Change the project begin&end date.'; -$lang->program->afterInfo = "Project is created. Next you can "; $lang->program->PRJProgramTitle['0'] = 'Hide'; $lang->program->PRJProgramTitle['base'] = 'Base-level program only'; diff --git a/module/program/lang/en.php b/module/program/lang/en.php index 715d55138f..eea8bf877c 100644 --- a/module/program/lang/en.php +++ b/module/program/lang/en.php @@ -38,9 +38,6 @@ $lang->program->errorNoProducts = 'At least one product is associated'; $lang->program->copyNoProject = 'There are no items available to copy.'; $lang->program->PRJSource = 'Project source:'; $lang->program->PRJStandalone = 'Projects that do not belong to a program.'; -$lang->program->tips = 'Note'; -$lang->program->setTeam = 'Set Team'; -$lang->program->goback = 'Go Back'; /* Fields. */ $lang->program->common = 'Program'; @@ -153,7 +150,6 @@ $lang->program->cannotCancelCat = "It has child projects, so you cannot unmark $lang->program->parentBeginEnd = "Parent begin&end date: %s ~ %s"; $lang->program->childLongTime = "If a child as long-term projects, the parent should be long-term too."; $lang->program->readjustTime = 'Change the project begin&end date.'; -$lang->program->afterInfo = "Project is created. Next you can "; $lang->program->PRJProgramTitle['0'] = 'Hide'; $lang->program->PRJProgramTitle['base'] = 'Base-level program only'; diff --git a/module/program/lang/fr.php b/module/program/lang/fr.php index 4764bb28ec..341cdba341 100644 --- a/module/program/lang/fr.php +++ b/module/program/lang/fr.php @@ -38,9 +38,6 @@ $lang->program->errorNoProducts = 'At least one product is associated'; $lang->program->copyNoProject = 'There are no items available to copy.'; $lang->program->PRJSource = 'Project source:'; $lang->program->PRJStandalone = 'Projects that do not belong to a program.'; -$lang->program->tips = 'Note'; -$lang->program->setTeam = 'Set Team'; -$lang->program->goback = 'Go Back'; /* Fields. */ $lang->program->common = 'Program'; @@ -153,7 +150,6 @@ $lang->program->cannotCancelCat = "It has child projects, so you cannot unmark $lang->program->parentBeginEnd = "Parent begin&end date: %s ~ %s"; $lang->program->childLongTime = "If a child as long-term projects, the parent should be long-term too."; $lang->program->readjustTime = 'Change the project begin&end date.'; -$lang->program->afterInfo = "Project is created. Next you can "; $lang->program->PRJProgramTitle['0'] = 'Hide'; $lang->program->PRJProgramTitle['base'] = 'Base-level program only'; diff --git a/module/program/lang/vi.php b/module/program/lang/vi.php index 4764bb28ec..341cdba341 100644 --- a/module/program/lang/vi.php +++ b/module/program/lang/vi.php @@ -38,9 +38,6 @@ $lang->program->errorNoProducts = 'At least one product is associated'; $lang->program->copyNoProject = 'There are no items available to copy.'; $lang->program->PRJSource = 'Project source:'; $lang->program->PRJStandalone = 'Projects that do not belong to a program.'; -$lang->program->tips = 'Note'; -$lang->program->setTeam = 'Set Team'; -$lang->program->goback = 'Go Back'; /* Fields. */ $lang->program->common = 'Program'; @@ -153,7 +150,6 @@ $lang->program->cannotCancelCat = "It has child projects, so you cannot unmark $lang->program->parentBeginEnd = "Parent begin&end date: %s ~ %s"; $lang->program->childLongTime = "If a child as long-term projects, the parent should be long-term too."; $lang->program->readjustTime = 'Change the project begin&end date.'; -$lang->program->afterInfo = "Project is created. Next you can "; $lang->program->PRJProgramTitle['0'] = 'Hide'; $lang->program->PRJProgramTitle['base'] = 'Base-level program only'; diff --git a/module/program/lang/zh-cn.php b/module/program/lang/zh-cn.php index 7e55d80407..fc30e50c91 100644 --- a/module/program/lang/zh-cn.php +++ b/module/program/lang/zh-cn.php @@ -39,9 +39,6 @@ $lang->program->errorNoProducts = '最少关联一个产品'; $lang->program->copyNoProject = '没有可用的项目来复制'; $lang->program->PRJSource = '项目来源:'; $lang->program->PRJStandalone = '没有所属项目集的项目'; -$lang->program->tips = '提示'; -$lang->program->setTeam = '设置团队'; -$lang->program->goback = '返回项目列表'; /* Fields. */ $lang->program->common = '项目集'; @@ -155,7 +152,6 @@ $lang->program->cannotCancelCat = "该项目下已经有子项目,无法取 $lang->program->parentBeginEnd = "父项目起止时间:%s ~ %s"; $lang->program->childLongTime = "子项目中有长期项目,父项目也应该是长期项目"; $lang->program->readjustTime = '重新调整项目起止时间'; -$lang->program->afterInfo = "项目添加成功,您现在可以进行以下操作:"; $lang->program->PRJProgramTitle['0'] = '不显示'; $lang->program->PRJProgramTitle['base'] = '只显示一级项目集'; diff --git a/module/program/view/prjcreate.html.php b/module/program/view/prjcreate.html.php index a30e21b844..5388473981 100644 --- a/module/program/view/prjcreate.html.php +++ b/module/program/view/prjcreate.html.php @@ -10,32 +10,6 @@ * @link http://www.zentao.net */ ?> - -createLink('program', 'PRJBrowse', "programID=$programID&browseType=all"); -} -else -{ - $defaultURL = $this->createLink('program', 'PGMBrowse'); -} -?> - -
- - -