diff --git a/module/action/control.php b/module/action/control.php index 6edd4aed0d..f18d8fa2c9 100755 --- a/module/action/control.php +++ b/module/action/control.php @@ -115,6 +115,33 @@ class action extends control $preferredType = $preferredType + $toPreferredType; } + /* Get the projects name of executions. */ + if($browseType == 'execution') + { + $this->loadModel('project'); + $projectIdList = array(); + foreach($trashes as $trash) $projectIdList[] = $trash->project; + $this->view->projectList = $this->project->getByIdList($projectIdList, 'all'); + } + + /* Get the products name of story. */ + if($browseType == 'story') + { + $this->loadModel('story'); + $storyIdList = array(); + foreach($trashes as $trash) $storyIdList[] = $trash->objectID; + $this->view->productList = $this->story->getByList($storyIdList, 'story', 'all'); + } + + /* Get the executions name of task. */ + if($browseType == 'task') + { + $this->app->loadLang('task'); + $this->loadModel('execution'); + $executionIdList = array(); + foreach($trashes as $trash) $executionIdList[] = $trash->execution; + $this->view->executionList = $this->execution->getByIdList($executionIdList, 'all'); + } /* Title and position. */ $this->view->title = $this->lang->action->trash; $this->view->position[] = $this->lang->action->trash; diff --git a/module/action/css/trash.css b/module/action/css/trash.css index e5b7a61042..2c21a2cced 100755 --- a/module/action/css/trash.css +++ b/module/action/css/trash.css @@ -6,3 +6,9 @@ .dropdown-menu .btn-active-text:hover .text:after {border-bottom: 0px;} #querybox #searchform{border-bottom: 1px solid #ddd; margin-bottom: 20px;} +td.flex {display: flex; flex-flow: row nowrap; justify-content: flex-start; align-items: center; margin-bottom: 0px;} +.flex span.label-danger {margin-left: 5px; min-width: 50px;} +[lang^=en] .flex span.label-danger {min-width: 52px;} +[lang^=de] .flex span.label-danger {min-width: 58px;} +[lang^=fr] .flex span.label-danger {min-width: 63px;} +.c-name > .text-ellipsis {text-overflow: clip;} diff --git a/module/action/view/trash.html.php b/module/action/view/trash.html.php index 51ba347510..0fd43c9a87 100755 --- a/module/action/view/trash.html.php +++ b/module/action/view/trash.html.php @@ -82,6 +82,15 @@ action->objectType);?> idAB);?> action->objectName;?> + systemMode == 'new' and $currentObjectType == 'execution'):?> + lang->project->project;?> + + + lang->story->product;?> + + + lang->task->execution;?> + action->actor);?> action->date);?> actions;?> @@ -137,6 +146,30 @@ } ?> + systemMode == 'new' and $currentObjectType == 'execution'):?> + + project]->name;?> + project]->deleted):?> + lang->project->deleted;?> + + + + + + objectID]->productTitle;?> + objectID]->productDeleted):?> + lang->story->deleted;?> + + + + + + execution]->name;?> + execution]->deleted):?> + lang->execution->deleted;?> + + + actor);?> date;?> diff --git a/module/execution/model.php b/module/execution/model.php index 12e239fd6b..e7fa35e804 100644 --- a/module/execution/model.php +++ b/module/execution/model.php @@ -1315,12 +1315,16 @@ class executionModel extends model * Get execution by idList. * * @param array $executionIdList + * @param string $mode all * @access public * @return array */ - public function getByIdList($executionIdList = array()) + public function getByIdList($executionIdList = array(), $mode = '') { - return $this->dao->select('*')->from(TABLE_EXECUTION)->where('id')->in($executionIdList)->andWhere('deleted')->eq(0)->fetchAll('id'); + return $this->dao->select('*')->from(TABLE_EXECUTION) + ->where('id')->in($executionIdList) + ->beginIF($mode != 'all')->andWhere('deleted')->eq(0)->fi() + ->fetchAll('id'); } /** diff --git a/module/project/lang/de.php b/module/project/lang/de.php index 1c678d1312..17b7fd1bc2 100644 --- a/module/project/lang/de.php +++ b/module/project/lang/de.php @@ -48,7 +48,7 @@ $lang->project->errorSamePlans = 'Project cannot be associated with multiple $lang->project->errorNoProducts = 'At least one product is associated'; $lang->project->copyNoProject = 'There are no items available to copy.'; $lang->project->searchByName = 'Enter the project name to search'; -$lang->project->deleted = 'Deleted'; +$lang->project->deleted = 'Gelöscht'; $lang->project->linkedProducts = "Linked {$lang->productCommon}s"; $lang->project->unlinkedProducts = "Unlinked {$lang->productCommon}s"; $lang->project->testreport = 'Testreport'; diff --git a/module/project/lang/fr.php b/module/project/lang/fr.php index 1d650086f8..172369bcb4 100644 --- a/module/project/lang/fr.php +++ b/module/project/lang/fr.php @@ -48,7 +48,7 @@ $lang->project->errorSamePlans = 'Project cannot be associated with multiple $lang->project->errorNoProducts = 'At least one product is associated'; $lang->project->copyNoProject = 'There are no items available to copy.'; $lang->project->searchByName = 'Enter the project name to retrieve'; -$lang->project->deleted = 'Deleted'; +$lang->project->deleted = 'Supprimé'; $lang->project->linkedProducts = "Linked {$lang->productCommon}s"; $lang->project->unlinkedProducts = "Unlinked {$lang->productCommon}s"; $lang->project->testreport = 'Testreport'; diff --git a/module/project/model.php b/module/project/model.php index b5c1778f51..f1df79b9c8 100644 --- a/module/project/model.php +++ b/module/project/model.php @@ -797,16 +797,17 @@ class projectModel extends model /** * Get project by id list. * - * @param array $projectIdList + * @param array $projectIdList + * @param string $mode all * @access public * @return object */ - public function getByIdList($projectIdList = array()) + public function getByIdList($projectIdList = array(), $mode = '') { return $this->dao->select('*')->from(TABLE_PROJECT) ->where('type')->eq('project') ->andWhere('id')->in($projectIdList) - ->beginIF(!$this->app->user->admin)->andWhere('id')->in($this->app->user->view->projects)->fi() + ->beginIF(!$this->app->user->admin and $mode != 'all')->andWhere('id')->in($this->app->user->view->projects)->fi() ->fetchAll('id'); } diff --git a/module/story/lang/fr.php b/module/story/lang/fr.php index fe5900a239..5896365b16 100644 --- a/module/story/lang/fr.php +++ b/module/story/lang/fr.php @@ -167,7 +167,7 @@ $lang->story->copy = "Copier Story"; $lang->story->total = "Stories Total"; $lang->story->draft = 'Brouillon'; $lang->story->unclosed = 'Non Fermées'; -$lang->story->deleted = 'Supprimée'; +$lang->story->deleted = 'Supprimé'; $lang->story->released = 'Stories Versionnées'; $lang->story->URChanged = 'Requirement Changed'; $lang->story->design = 'Designs'; diff --git a/module/story/model.php b/module/story/model.php index dbef4f420d..f056eb3faa 100644 --- a/module/story/model.php +++ b/module/story/model.php @@ -86,17 +86,18 @@ class storyModel extends model * * @param int|array|string $storyIdList * @param string $type requirement|story + * @param string $mode all * @access public * @return array */ - public function getByList($storyIdList = 0, $type = 'story') + public function getByList($storyIdList = 0, $type = 'story', $mode = '') { - return $this->dao->select('t1.*, t2.spec, t2.verify, t3.name as productTitle') + return $this->dao->select('t1.*, t2.spec, t2.verify, t3.name as productTitle, t3.deleted as productDeleted') ->from(TABLE_STORY)->alias('t1') ->leftJoin(TABLE_STORYSPEC)->alias('t2')->on('t1.id=t2.story') ->leftJoin(TABLE_PRODUCT)->alias('t3')->on('t1.product=t3.id') - ->where('t1.deleted')->eq(0) - ->andWhere('t1.version=t2.version') + ->where('t1.version=t2.version') + ->beginIF($mode != 'all')->andWhere('t1.deleted')->eq(0)->fi() ->beginIF($storyIdList)->andWhere('t1.id')->in($storyIdList)->fi() ->beginIF(!$storyIdList)->andWhere('t1.type')->eq($type)->fi() ->fetchAll('id');