diff --git a/module/program/control.php b/module/program/control.php index 0329bfaef3..2c08f8ddb8 100644 --- a/module/program/control.php +++ b/module/program/control.php @@ -1381,6 +1381,35 @@ class program extends control $this->display('project', 'activate'); } + /** + * Delete a project. + * + * @param int $projectID + * @param string $from + * @param int $programID + * @access public + * @return void + */ + public function PRJDelete($projectID, $confirm = 'no', $from = 'PRJ', $programID = 0) + { + if($confirm == 'no') + { + $project = $this->program->getPRJByID($projectID); + echo js::confirm(sprintf($this->lang->program->confirmDelete, $project->name), $this->createLink('program', 'PRJDelete', "projectID=$projectID&confirm=yes&from=$from&programID=$programID")); + die(); + } + else + { + $this->project->delete(TABLE_PROJECT, $projectID); + $this->dao->update(TABLE_DOCLIB)->set('deleted')->eq(1)->where('project')->eq($projectID)->exec(); + $this->project->updateUserView($projectID); + $this->session->set('project', ''); + + $link = $from == 'PRJ' ? inLink('PRJBrowse', 'programID=' . $programID) : inLink('PGMProject', 'programID=' . $programID); + die(js::locate($link, 'parent')); + } + } + /** * Update projects order. * diff --git a/module/program/view/pgmproject.html.php b/module/program/view/pgmproject.html.php index 8e2a131e67..1ff9546054 100644 --- a/module/program/view/pgmproject.html.php +++ b/module/program/view/pgmproject.html.php @@ -50,7 +50,7 @@ js::set('browseType', $browseType); program->PRJConsume;?> program->PRJSurplus;?> program->PRJProgress;?> - actions;?> + actions;?> @@ -86,6 +86,7 @@ js::set('browseType', $browseType); id", $project, 'list', 'pause', '', 'iframe', true);?> id", $project, 'list', 'off', '', 'iframe', true);?> createLink("program", "PRJEdit", "programID=$project->id"), "", '', "class='btn' title='{$lang->edit}'");?> + id&confirm=no&from=PGM&programID=$programID", $project, 'list', 'trash', 'hiddenwin', '', true);?> diff --git a/module/program/view/prjbrowse.html.php b/module/program/view/prjbrowse.html.php index 63733d19f3..a9fd9aa205 100644 --- a/module/program/view/prjbrowse.html.php +++ b/module/program/view/prjbrowse.html.php @@ -62,7 +62,7 @@ js::set('browseType', $browseType); program->end;?> program->PRJBudget;?> program->PRJPM;?> - actions;?> + actions;?> program->PRJUpdateOrder);?> @@ -89,6 +89,7 @@ js::set('browseType', $browseType); id", $project, 'list', 'pause', '', 'iframe', true);?> id", $project, 'list', 'off', '', 'iframe', true);?> createLink("program", "PRJEdit", "programID=$project->id"), "", '', "class='btn' title='{$lang->edit}'");?> + id&confirm=no&from=PRJ&programID=$programID", $project, 'list', 'trash', 'hiddenwin', '', true);?>