From 9c73720e57e4e59aef3bad4076fbe4b3d9392adf Mon Sep 17 00:00:00 2001 From: tianshujie98 Date: Sun, 25 Apr 2021 14:03:55 +0800 Subject: [PATCH 01/73] * Adjust icon. --- module/testcase/view/groupcase.html.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/module/testcase/view/groupcase.html.php b/module/testcase/view/groupcase.html.php index 100cd5d41c..88a1f876b6 100644 --- a/module/testcase/view/groupcase.html.php +++ b/module/testcase/view/groupcase.html.php @@ -92,7 +92,7 @@ stepNumber;?> id", $case, 'list');?> - id", $case, 'list', '', 'hiddenwin');?> + id", $case, 'list', 'trash', 'hiddenwin');?> From dc02b6cbf619b35843d1ae8ca746bdb87913b65d Mon Sep 17 00:00:00 2001 From: tianshujie98 Date: Sun, 25 Apr 2021 14:12:58 +0800 Subject: [PATCH 02/73] * Remove unused code. --- module/bug/view/create.html.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/module/bug/view/create.html.php b/module/bug/view/create.html.php index eb8f6ca079..7dba03779c 100644 --- a/module/bug/view/create.html.php +++ b/module/bug/view/create.html.php @@ -325,7 +325,7 @@ js::set('blockID', $blockID); - + id);?> From d1dcc466f53a22eb5738aac9a243bc3014bbcb60 Mon Sep 17 00:00:00 2001 From: hufangzhou <746775970@qq.com> Date: Sun, 25 Apr 2021 14:50:08 +0800 Subject: [PATCH 03/73] * Fix a bug. --- module/story/view/track.html.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/module/story/view/track.html.php b/module/story/view/track.html.php index 3b8aeadbff..29e9ca847a 100644 --- a/module/story/view/track.html.php +++ b/module/story/view/track.html.php @@ -31,7 +31,7 @@ ". $projectProducts[$productID]->name . '', '', 'class="dropdown-toggle" data-toggle="dropdown"');?> From 59a4b7206587f7c059ffb8cfd9e7278183baa7b2 Mon Sep 17 00:00:00 2001 From: tianshujie98 Date: Sun, 25 Apr 2021 15:01:44 +0800 Subject: [PATCH 04/73] * Fix bug create error. --- module/product/control.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/module/product/control.php b/module/product/control.php index 2a29cbdc26..345eb79397 100644 --- a/module/product/control.php +++ b/module/product/control.php @@ -848,7 +848,7 @@ class product extends control $projects += $this->product->getProjectPairsByProduct($productID, $branch ? "0,$branch" : $branch); if($this->app->getViewType() == 'json') die(json_encode($projects)); - die(html::select('project', $projects, $projectID, "class='form-control' onchange='loadProductExecutions({$productID})'")); + die(html::select('project', $projects, $projectID, "class='form-control' onchange='loadProductExecutions({$productID}, this.value)'")); } /** From 8776066762c5d01510536a365ab3d3ae22c8db74 Mon Sep 17 00:00:00 2001 From: tianshujie98 Date: Sun, 25 Apr 2021 15:07:05 +0800 Subject: [PATCH 05/73] * Adjust icon. --- module/story/view/zerocase.html.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/module/story/view/zerocase.html.php b/module/story/view/zerocase.html.php index 76db4eb408..77d9aca830 100644 --- a/module/story/view/zerocase.html.php +++ b/module/story/view/zerocase.html.php @@ -78,7 +78,7 @@ common::printIcon('story', 'change', $vars, $story, 'list', 'fork'); common::printIcon('story', 'review', $vars, $story, 'list', 'glasses'); common::printIcon('story', 'close', $vars, $story, 'list', 'off', '', 'iframe', 'yes'); - common::printIcon('story', 'edit', $vars, $story, 'list', 'pencil'); + common::printIcon('story', 'edit', $vars, $story, 'list'); $this->app->openApp = 'qa'; common::printIcon('story', 'createCase', "productID=$story->product&branch=0&module=0&from=¶m=0&$vars", $story, 'list', 'sitemap'); ?> From 3a83e29c0aa3d46f8d4246b67eeaeffcb1cc86ba Mon Sep 17 00:00:00 2001 From: tianshujie98 Date: Sun, 25 Apr 2021 15:38:54 +0800 Subject: [PATCH 06/73] * Adjust go back button. --- module/story/view/review.html.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/module/story/view/review.html.php b/module/story/view/review.html.php index 7370f0fc82..e58d1ea720 100644 --- a/module/story/view/review.html.php +++ b/module/story/view/review.html.php @@ -84,7 +84,7 @@ var assignedTo = 'lastEditedBy ? print($story->lastEditedBy) : pri - goback, $app->session->storyList ? $app->session->storyList : inlink('view', "storyID=$story->id"), 'self', '', 'btn btn-wide');?> + session->storyList ? $app->session->storyList : inlink('view', "storyID=$story->id"), $lang->goback, '', 'class="btn btn-wide"');?> From 2ab738c70ef5711fa3004f5ff83145f7ba2e7783 Mon Sep 17 00:00:00 2001 From: holan20180123 <56391770@qq.com> Date: Sun, 25 Apr 2021 16:40:55 +0800 Subject: [PATCH 07/73] * Fix bug #12350. --- module/my/view/testcase.html.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/module/my/view/testcase.html.php b/module/my/view/testcase.html.php index c6549e4e15..f31997f73a 100644 --- a/module/my/view/testcase.html.php +++ b/module/my/view/testcase.html.php @@ -99,7 +99,7 @@ product&branch=$case->branch&extra=caseID=$caseID,version=$case->version,runID=$runID", $case, 'list', 'bug', '', '', '', "data-app='qa'"); + common::printIcon('testcase', 'createBug', "product=$case->product&branch=$case->branch&extra=caseID=$caseID,version=$case->version,runID=$runID", $case, 'list', 'bug', '', 'iframe', 'true', "data-app='qa' data-toggle=''"); common::printIcon('testcase', 'create', "productID=$case->product&branch=$case->branch&moduleID=$case->module&from={$app->rawMethod}¶m=$caseID", $case, 'list', 'copy', '', 'iframe', true, "data-width='95%'"); common::printIcon('testtask', 'runCase', "runID=$runID&caseID=$caseID&version=$case->version", '', 'list', 'play', '', 'iframe', true, "data-width='95%'", '', $case->project); common::printIcon('testtask', 'results', "runID=$runID&caseID=$caseID", '', 'list', 'list-alt', '', 'iframe', true, "data-width='95%'", '', $case->project); From 6ee3cf890048b85bcfee17360912e2e4834e1f58 Mon Sep 17 00:00:00 2001 From: holan20180123 <56391770@qq.com> Date: Sun, 25 Apr 2021 16:46:11 +0800 Subject: [PATCH 08/73] * Fix bug #12349. --- module/my/view/testcase.html.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/module/my/view/testcase.html.php b/module/my/view/testcase.html.php index f31997f73a..4c854bb812 100644 --- a/module/my/view/testcase.html.php +++ b/module/my/view/testcase.html.php @@ -54,7 +54,7 @@ priAB);?> testcase->title);?> - testtask->common);?> + testtask->common);?> typeAB);?> openedByAB);?> @@ -87,7 +87,7 @@ task";?> createLink('testcase', 'view', $params), $case->title, null, "style='color: $case->color'");?> - taskName;?> + taskName;?> testcase->typeList, $case->type);?> openedBy);?> From 8446e34e641206453f7830ba2036b0a7191a5130 Mon Sep 17 00:00:00 2001 From: qiyu-xie Date: Mon, 26 Apr 2021 08:53:20 +0800 Subject: [PATCH 09/73] * Fix bug#12359. --- module/product/view/create.html.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/module/product/view/create.html.php b/module/product/view/create.html.php index 3178431157..9488585b1c 100644 --- a/module/product/view/create.html.php +++ b/module/product/view/create.html.php @@ -75,7 +75,7 @@ product->acl;?> product->aclList, 'private', "onclick='setWhite(this.value);'", 'block'));?> - + whitelist;?> From 32e900f5183cee83b420b54b436ad2ced5c47b4f Mon Sep 17 00:00:00 2001 From: hufangzhou <746775970@qq.com> Date: Mon, 26 Apr 2021 09:05:49 +0800 Subject: [PATCH 10/73] * Fix bug #12360. --- module/block/css/dashboard.css | 5 +++++ module/block/view/scrumoverviewblock.html.php | 6 ------ 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/module/block/css/dashboard.css b/module/block/css/dashboard.css index 4436a70bf2..fa091d4202 100644 --- a/module/block/css/dashboard.css +++ b/module/block/css/dashboard.css @@ -26,3 +26,8 @@ body {padding-bottom: 20px;} #dashboard .block-sm .hide-in-sm {display: none;} #dashboard .block-dynamic .panel-body {overflow-x: hidden;} .modal-body {padding: 10px 20px 20px 20px;} + +#dashboard .block-scrumoverview .table {margin-bottom: 12px;} +#dashboard .block-scrumoverview .table thead tr th {padding-left: 0; text-align: right; border-bottom: unset;} +#dashboard .block-scrumoverview .table tbody tr td {padding-left: 0;} +#dashboard .block-scrumoverview .table tbody tr th {text-align: right;} diff --git a/module/block/view/scrumoverviewblock.html.php b/module/block/view/scrumoverviewblock.html.php index 7269f3cce1..47d9cb5ab4 100644 --- a/module/block/view/scrumoverviewblock.html.php +++ b/module/block/view/scrumoverviewblock.html.php @@ -13,12 +13,6 @@
" . $lang->project->create, '', "class='btn btn-primary'")?>
- From 9a5d8d50b97e4f7bb4b46216dfc0f212ac2088ee Mon Sep 17 00:00:00 2001 From: holan20180123 <56391770@qq.com> Date: Mon, 26 Apr 2021 09:07:28 +0800 Subject: [PATCH 11/73] * Fix bug #12347. --- module/action/model.php | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/module/action/model.php b/module/action/model.php index e002345d95..aec6eb0dec 100755 --- a/module/action/model.php +++ b/module/action/model.php @@ -868,6 +868,7 @@ class actionModel extends model public function transformActions($actions) { $this->app->loadLang('todo'); + $requirements = array(); /* Get commiters. */ $commiters = $this->loadModel('user')->getCommiters(); @@ -901,6 +902,16 @@ class actionModel extends model $objectProject[$object->id] = $object->project > 0 ? $object->project : $object->id; } } + elseif($objectType == 'story') + { + $objectInfo = $this->dao->select('id,title,type')->from($table)->where('id')->in($objectIds)->fetchAll(); + foreach($objectInfo as $object) + { + $objectName[$object->id] = $object->title; + if($object->type == 'requirement') $requirements[$object->id] = $object->id; + } + $objectProject = array(); + } else { $objectName = $this->dao->select("id, $field AS name")->from($table)->where('id')->in($objectIds)->fetchPairs(); @@ -946,6 +957,10 @@ class actionModel extends model if(isset($this->lang->action->label->$objectType)) { $objectLabel = $this->lang->action->label->$objectType; + + /* Replace story to requirement. */ + if(in_array($action->objectID, $requirements)) $objectLabel = str_replace($this->lang->SRCommon, $this->lang->URCommon, $objectLabel); + if(!is_array($objectLabel)) $action->objectLabel = $objectLabel; if(is_array($objectLabel) and isset($objectLabel[$actionType])) $action->objectLabel = $objectLabel[$actionType]; } From 7ae8f4a32a1a309718434073f9c816cc77bbd44d Mon Sep 17 00:00:00 2001 From: hufangzhou <746775970@qq.com> Date: Mon, 26 Apr 2021 09:22:48 +0800 Subject: [PATCH 12/73] * Fix bug #12371. --- module/testcase/control.php | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/module/testcase/control.php b/module/testcase/control.php index 0db7e2a38b..dba61c1b25 100644 --- a/module/testcase/control.php +++ b/module/testcase/control.php @@ -617,8 +617,6 @@ class testcase extends control } } - $product = $this->product->getByID($case->product); - $branches = $product->type == 'normal' ? array() : $this->loadModel('branch')->getPairs($case->product); $isLibCase = ($case->lib and empty($case->product)); if($isLibCase) { @@ -633,6 +631,9 @@ class testcase extends control else { $productID = $case->product; + $product = $this->product->getByID($productID); + $branches = $product->type == 'normal' ? array() : $this->loadModel('branch')->getPairs($productID); + if($this->app->openApp == 'project') $this->loadModel('project')->setMenu($this->session->project); if($this->app->openApp == 'execution') $this->loadModel('execution')->setMenu($this->session->execution); if($this->app->openApp == 'qa') $this->testcase->setMenu($this->products, $productID, $case->branch); @@ -640,6 +641,8 @@ class testcase extends control $this->view->title = "CASE #$case->id $case->title - " . $this->products[$productID]; $this->view->position[] = html::a($this->createLink('testcase', 'browse', "productID=$productID"), $this->products[$productID]); + $this->view->product = $product; + $this->view->branches = $branches; $this->view->productName = $this->products[$productID]; $this->view->branchName = $product->type == 'normal' ? '' : zget($branches, $case->branch, ''); } @@ -659,7 +662,6 @@ class testcase extends control $this->view->case = $case; $this->view->from = $from; $this->view->taskID = $taskID; - $this->view->product = $product; $this->view->version = $version ? $version : $case->version; $this->view->modulePath = $this->tree->getParents($case->module); $this->view->caseModule = empty($case->module) ? '' : $this->tree->getById($case->module); @@ -669,7 +671,6 @@ class testcase extends control $this->view->runID = $from == 'testcase' ? 0 : $run->id; $this->view->isLibCase = $isLibCase; $this->view->caseFails = $caseFails; - $this->view->branches = $branches; $this->display(); } From d3df2dfa61cc58ce8ad85f00b97cd763dd563837 Mon Sep 17 00:00:00 2001 From: Yagami <976204163@qq.com> Date: Mon, 26 Apr 2021 09:27:00 +0800 Subject: [PATCH 13/73] * Remove unused code. --- module/my/view/project.html.php | 7 ------- 1 file changed, 7 deletions(-) diff --git a/module/my/view/project.html.php b/module/my/view/project.html.php index 8d0131955e..83b0a663c4 100644 --- a/module/my/view/project.html.php +++ b/module/my/view/project.html.php @@ -26,13 +26,6 @@

project->empty;?> - config->maxVersion) and common::hasPriv('project', 'createGuide')):?> - createLink('project', 'createGuide'), " " . $lang->my->createProgram, '', "class='btn btn-info' data-toggle=modal");?> - config->systemMode == 'new' and common::hasPriv('project', 'create')):?> - createLink('project', 'create', 'mode=scrum'), '' . $lang->project->create, '', 'class="btn btn-info"');?> - config->systemMode == 'classic' and common::hasPriv('execution', 'create')):?> - createLink('execution', 'create'), '' . $lang->execution->create, '', 'class="btn btn-info"');?> -

From 919fba9d2dba16140c4d84c9d206ce2478b234a6 Mon Sep 17 00:00:00 2001 From: hufangzhou <746775970@qq.com> Date: Mon, 26 Apr 2021 09:35:50 +0800 Subject: [PATCH 14/73] * Fix bug #12365. --- module/execution/model.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/module/execution/model.php b/module/execution/model.php index e3f33659d8..d8df221d79 100644 --- a/module/execution/model.php +++ b/module/execution/model.php @@ -840,7 +840,7 @@ class executionModel extends model */ public function getSwitcher($executionID, $currentModule, $currentMethod) { - if(in_array($currentMethod, array('index', 'all', 'batchedit', 'create'))) return; + if($currentModule == 'execution' and in_array($currentMethod, array('index', 'all', 'batchedit', 'create'))) return; $currentExecutionName = $this->lang->execution->common; if($executionID) From f68b70bb7aa2177f48a1fcd3dd0960f307254354 Mon Sep 17 00:00:00 2001 From: qiyu-xie Date: Mon, 26 Apr 2021 09:50:40 +0800 Subject: [PATCH 15/73] * Fix bug#12363. --- module/execution/lang/de.php | 9 +++++---- module/execution/lang/en.php | 1 + module/execution/lang/fr.php | 9 +++++---- module/execution/lang/vi.php | 9 +++++---- module/execution/lang/zh-cn.php | 1 + module/execution/lang/zh-tw.php | 1 + module/execution/view/all.html.php | 11 +++++++++++ 7 files changed, 29 insertions(+), 12 deletions(-) diff --git a/module/execution/lang/de.php b/module/execution/lang/de.php index 86162d4178..87ed04529d 100644 --- a/module/execution/lang/de.php +++ b/module/execution/lang/de.php @@ -277,7 +277,7 @@ $lang->execution->howToUpdateBurn = " Story verknüpfen。"; $lang->execution->haveDraft = "There are %s draft stories can't be linked."; -$lang->execution->doneExecutions = 'Erledigt'; +$lang->execution->doneExecutions = 'Erledigt'; $lang->execution->selectDept = 'Abteilung wählen'; $lang->execution->selectDeptTitle = 'Abteilung wählen'; $lang->execution->copyTeam = 'Team kopieren'; @@ -285,12 +285,13 @@ $lang->execution->copyFromTeam = "Kopieren von {$lang->executionCommon} T $lang->execution->noMatched = "$lang->executionCommon mit '%s' konnte nicht gefunden werden."; $lang->execution->copyTitle = "Wählen Sie ein {$lang->executionCommon} zum Kopieren."; $lang->execution->copyTeamTitle = "Wählen Sie ein {$lang->executionCommon} Team zum Kopieren."; -$lang->execution->copyNoExecution = "{$lang->executionCommon} kann nicht kopiert werden."; -$lang->execution->copyFromExecution = "Kopie von {$lang->executionCommon} %s"; +$lang->execution->copyNoExecution = "{$lang->executionCommon} kann nicht kopiert werden."; +$lang->execution->copyFromExecution = "Kopie von {$lang->executionCommon} %s"; $lang->execution->cancelCopy = 'Kopieren abbrechen'; $lang->execution->byPeriod = 'Nach Zeit'; $lang->execution->byUser = 'Nach Benutzer'; -$lang->execution->noExecution = 'Keine Projekte. '; +$lang->execution->noExecution = 'Keine Projekte. '; +$lang->execution->noExecutions = "No {$lang->execution->common}."; $lang->execution->noMembers = 'Keine Mitglieder. '; $lang->execution->workloadTotal = "The cumulative workload ratio should not exceed 100, and the total workload under the current product is: %s"; $lang->execution->linkPRJStoryTip = "(Link {$lang->SRCommon} comes from {$lang->SRCommon} linked under the project)"; diff --git a/module/execution/lang/en.php b/module/execution/lang/en.php index 21dc5aed81..f68dd5d4bb 100644 --- a/module/execution/lang/en.php +++ b/module/execution/lang/en.php @@ -291,6 +291,7 @@ $lang->execution->cancelCopy = 'Cancel Copy'; $lang->execution->byPeriod = 'By Time'; $lang->execution->byUser = 'By User'; $lang->execution->noExecution = "No {$lang->executionCommon}. "; +$lang->execution->noExecutions = "No {$lang->execution->common}."; $lang->execution->noMembers = 'No team members yet. '; $lang->execution->workloadTotal = "The cumulative workload ratio should not exceed 100, and the total workload under the current product is: %s"; // $lang->execution->linkProjectStoryTip = "(Link {$lang->SRCommon} comes from {$lang->SRCommon} linked under the execution)"; diff --git a/module/execution/lang/fr.php b/module/execution/lang/fr.php index 5e9a4a1e0b..70eb03758b 100644 --- a/module/execution/lang/fr.php +++ b/module/execution/lang/fr.php @@ -277,7 +277,7 @@ $lang->execution->howToUpdateBurn = "executionCommon} qui sont associées à {$lang->productCommon} et vérifiez qu'elles ont bien été validées."; $lang->execution->productStories = "Les stories associées au {$lang->executionCommon} sont une portion des stories associées au {$lang->productCommon}. Les stories ne peuvent être associées à un {$lang->executionCommon} qu'après avoir été validées. Associer Stories maintenant."; $lang->execution->haveDraft = "%s stories sont encore en conception, elles ne peuvent pas être associées au {$lang->executionCommon} actuellement."; -$lang->execution->doneExecutions = 'Terminé'; +$lang->execution->doneExecutions = 'Terminé'; $lang->execution->selectDept = 'Sélection Compartiment'; $lang->execution->selectDeptTitle = 'Sélection Utilisateur'; $lang->execution->copyTeam = 'Copier Equipe'; @@ -285,12 +285,13 @@ $lang->execution->copyFromTeam = "Copié de l'Equipe {$lang->executionCom $lang->execution->noMatched = "Aucun $lang->executionCommon inclus '%s' ne peut être trouvé."; $lang->execution->copyTitle = "Choisissez un {$lang->executionCommon} à copier."; $lang->execution->copyTeamTitle = "Choisissez une Equipe {$lang->executionCommon} à copier."; -$lang->execution->copyNoExecution = "Aucun {$lang->executionCommon} ne peut être copié."; -$lang->execution->copyFromExecution = "Copié du {$lang->executionCommon} %s"; +$lang->execution->copyNoExecution = "Aucun {$lang->executionCommon} ne peut être copié."; +$lang->execution->copyFromExecution = "Copié du {$lang->executionCommon} %s"; $lang->execution->cancelCopy = 'Annuler la copie'; $lang->execution->byPeriod = 'Par Temps'; $lang->execution->byUser = 'Par Utilisateur'; -$lang->execution->noExecution = "Aucun {$lang->executionCommon}. "; +$lang->execution->noExecution = "Aucun {$lang->executionCommon}. "; +$lang->execution->noExecutions = "Aucun {$lang->execution->common}."; $lang->execution->noMembers = "Actuellement il n'y a aucun membre dans l'équipe. On ne va pas aller loin... "; $lang->execution->workloadTotal = "The cumulative workload ratio should not exceed 100, and the total workload under the current product is: %s"; $lang->execution->linkPRJStoryTip = "(Link {$lang->SRCommon} comes from {$lang->SRCommon} linked under the project)"; diff --git a/module/execution/lang/vi.php b/module/execution/lang/vi.php index da7273e33c..cdd7cb6076 100644 --- a/module/execution/lang/vi.php +++ b/module/execution/lang/vi.php @@ -277,7 +277,7 @@ $lang->execution->howToUpdateBurn = " Liên kết câu chuyện now."; $lang->execution->haveDraft = "%s câu chuyện đang nháp, bởi vậy chúng không thể liên kết."; -$lang->execution->doneExecutions = 'Kết thúc'; +$lang->execution->doneExecutions = 'Kết thúc'; $lang->execution->selectDept = 'Chọn phòng/ban'; $lang->execution->selectDeptTitle = 'Chọn người dùng'; $lang->execution->copyTeam = 'Copy đội nhóm'; @@ -285,12 +285,13 @@ $lang->execution->copyFromTeam = "Sao chép từ {$lang->executionCommon} $lang->execution->noMatched = "Không có $lang->executionCommon bao gồm '%s' có thể được tìm thấy."; $lang->execution->copyTitle = "Chọn một {$lang->executionCommon} để sao chép."; $lang->execution->copyTeamTitle = "Chọn một {$lang->executionCommon} đội nhóm để sao chép."; -$lang->execution->copyNoExecution = "Không có {$lang->executionCommon} có thể sao chép."; -$lang->execution->copyFromExecution = "Sao chép từ {$lang->executionCommon} %s"; +$lang->execution->copyNoExecution = "Không có {$lang->executionCommon} có thể sao chép."; +$lang->execution->copyFromExecution = "Sao chép từ {$lang->executionCommon} %s"; $lang->execution->cancelCopy = 'Hủy sao chép'; $lang->execution->byPeriod = 'Theo thời gian'; $lang->execution->byUser = 'Theo người dùng'; -$lang->execution->noExecution = "Không có {$lang->executionCommon} nào"; +$lang->execution->noExecution = "Không có {$lang->executionCommon} nào"; +$lang->execution->noExecutions = "Không có {$lang->execution->common} nào"; $lang->execution->noMembers = 'Không có thành viên đội nhóm nào'; $lang->execution->workloadTotal = "The cumulative workload ratio should not exceed 100, and the total workload under the current product is: %s"; $lang->execution->linkPRJStoryTip = "(Link {$lang->SRCommon} comes from {$lang->SRCommon} linked under the project)"; diff --git a/module/execution/lang/zh-cn.php b/module/execution/lang/zh-cn.php index b35489f57c..503582f9aa 100644 --- a/module/execution/lang/zh-cn.php +++ b/module/execution/lang/zh-cn.php @@ -291,6 +291,7 @@ $lang->execution->cancelCopy = '取消复制'; $lang->execution->byPeriod = '按时间段'; $lang->execution->byUser = '按用户'; $lang->execution->noExecution = "暂时没有{$lang->executionCommon}。"; +$lang->execution->noExecutions = "暂时没有{$lang->execution->common}。"; $lang->execution->noMembers = '暂时没有团队成员。'; $lang->execution->workloadTotal = "工作量占比累计不应当超过100, 当前产品下的工作量之和为%s"; // $lang->execution->linkProjectStoryTip = "(关联{$lang->SRCommon}来源于项目下所关联的{$lang->SRCommon})"; diff --git a/module/execution/lang/zh-tw.php b/module/execution/lang/zh-tw.php index a41f945e45..09c12bc18b 100644 --- a/module/execution/lang/zh-tw.php +++ b/module/execution/lang/zh-tw.php @@ -291,6 +291,7 @@ $lang->execution->cancelCopy = '取消複製'; $lang->execution->byPeriod = '按時間段'; $lang->execution->byUser = '按用戶'; $lang->execution->noExecution = "暫時沒有{$lang->executionCommon}。"; +$lang->execution->noExecutions = "暫時沒有{$lang->execution->common}。"; $lang->execution->noMembers = '暫時沒有團隊成員。'; $lang->execution->workloadTotal = "工作量占比累計不應當超過100, 當前產品下的工作量之和為%s"; // $lang->execution->linkProjectStoryTip = "(關聯{$lang->SRCommon}來源於項目下所關聯的{$lang->SRCommon})"; diff --git a/module/execution/view/all.html.php b/module/execution/view/all.html.php index 1aefbfff89..eab25a40f5 100644 --- a/module/execution/view/all.html.php +++ b/module/execution/view/all.html.php @@ -38,6 +38,16 @@ td.hours {text-align: right; overflow: hidden; text-overflow: ellipsis; white-sp
+ +
+

+ execution->noExecutions : $lang->execution->noExecution;?> + + createLink('execution', 'create', "projectID=$projectID"), " " . ((($from == 'execution') and ($config->systemMode == 'new')) ? $lang->execution->createExec : $lang->execution->create), '', "class='btn btn-info' data-app='$from'");?> + +

+
+
' data-ride='table'>
@@ -154,6 +164,7 @@ td.hours {text-align: right; overflow: hidden; text-overflow: ellipsis; white-sp +