From b6cd8c99a442947bdc530e30b9bec5fe98d358fe Mon Sep 17 00:00:00 2001 From: holan20180123 <56391770@qq.com> Date: Wed, 12 Aug 2020 08:14:44 +0800 Subject: [PATCH 01/24] * Fix bug #2589. --- module/story/model.php | 1 + module/story/view/batchcreate.html.php | 2 ++ 2 files changed, 3 insertions(+) diff --git a/module/story/model.php b/module/story/model.php index 72dc3c455d..026deba7b6 100644 --- a/module/story/model.php +++ b/module/story/model.php @@ -331,6 +331,7 @@ class storyModel extends model $story->estimate = $stories->estimate[$i]; $story->status = ($stories->needReview[$i] == 0 and !$forceReview) ? 'active' : 'draft'; $story->keywords = $stories->keywords[$i]; + $story->sourceNote = $stories->sourceNote[$i]; $story->product = $productID; $story->openedBy = $this->app->user->account; $story->openedDate = $now; diff --git a/module/story/view/batchcreate.html.php b/module/story/view/batchcreate.html.php index afd3af2f0f..6873976817 100644 --- a/module/story/view/batchcreate.html.php +++ b/module/story/view/batchcreate.html.php @@ -51,6 +51,7 @@ story->title;?> '>story->spec;?> '>story->source;?> + '>story->sourceNote;?> '>story->verify;?> '>story->pri;?> '>story->estimate;?> @@ -87,6 +88,7 @@ '> '> + '> '> ' style='overflow:visible'> '> From 29a2c25ef190905f1f7d48855ffc284b54084ac9 Mon Sep 17 00:00:00 2001 From: holan20180123 <56391770@qq.com> Date: Wed, 12 Aug 2020 08:15:40 +0800 Subject: [PATCH 02/24] * Fix bug #3334. --- module/task/js/start.js | 10 ++++++++-- module/task/lang/de.php | 1 + module/task/lang/en.php | 1 + module/task/lang/fr.php | 1 + module/task/lang/vi.php | 1 + module/task/lang/zh-cn.php | 1 + module/task/lang/zh-tw.php | 1 + module/task/model.php | 5 +++++ module/task/view/start.html.php | 1 + 9 files changed, 20 insertions(+), 2 deletions(-) diff --git a/module/task/js/start.js b/module/task/js/start.js index 42d34541d7..593b56c216 100644 --- a/module/task/js/start.js +++ b/module/task/js/start.js @@ -1,9 +1,15 @@ /* If left = 0, warning. */ function checkLeft() { - var value = $("#left").val(); - if(isNaN(parseFloat(value)) || value == 0) + var left = $("#left").val(); + var consumed = $("#consumed").val(); + if(isNaN(parseFloat(left)) || left == 0) { + if(isNaN(parseFloat(consumed)) || consumed == 0) + { + alert(noticeTaskStart); + return false; + } var result = confirm(confirmFinish); if(!result) setTimeout(function() {$.enableForm()}, 500); return result; diff --git a/module/task/lang/de.php b/module/task/lang/de.php index e1acf374d2..eb2d6feac7 100644 --- a/module/task/lang/de.php +++ b/module/task/lang/de.php @@ -189,6 +189,7 @@ $lang->task->confirmChangeProject = "Wenn Sie {$lang->projectCommon} ändern, d $lang->task->confirmFinish = '"Reststunden " sind 0. Möchten Sue den Status auf Erledigt setzen?'; $lang->task->confirmRecord = '"Reststunden " sind 0. Möchten Sie den Task auf Erledigt setzen?'; $lang->task->confirmTransfer = '"Reststunden " sind 0. Möchten Sie den Task transferieren?'; +$lang->task->noticeTaskStart = '"Cost Hour" and "Left Hour" cannot be 0 at the same time.'; $lang->task->noticeLinkStory = "Es wurde keine Story verknüpft. Sie können %s für dieses Projekt, anschließend %s."; $lang->task->noticeSaveRecord = 'Ihre Stunden wurden nicht gespeichrt. Bitte erst speichern.'; $lang->task->commentActions = '%s. %s, kommentiert von %s.'; diff --git a/module/task/lang/en.php b/module/task/lang/en.php index cf2e440eb3..e05b6ba8c9 100644 --- a/module/task/lang/en.php +++ b/module/task/lang/en.php @@ -189,6 +189,7 @@ $lang->task->confirmChangeProject = "If you change {$lang->projectCommon}, Modu $lang->task->confirmFinish = '"Left Hour" is 0. Do you want to change the status to "Finished"?'; $lang->task->confirmRecord = '"Left Hour" is 0. Do you want to set the task as "Finished"?'; $lang->task->confirmTransfer = '"Left Hour" is 0，Do you want to transfer task?'; +$lang->task->noticeTaskStart = '"Cost Hour" and "Left Hour" cannot be 0 at the same time.'; $lang->task->noticeLinkStory = "No story has been linked. You can %s for this project, then %s."; $lang->task->noticeSaveRecord = 'Your Hour is not saved. Please save it first.'; $lang->task->commentActions = '%s. %s, commented by %s.'; diff --git a/module/task/lang/fr.php b/module/task/lang/fr.php index d0057e06bb..d57e19697b 100644 --- a/module/task/lang/fr.php +++ b/module/task/lang/fr.php @@ -189,6 +189,7 @@ $lang->task->confirmChangeProject = "Si vous changez {$lang->projectCommon}, Mo $lang->task->confirmFinish = '"Heures Restantes" à 0. Voulez-vous passer le statut à "Terminée" ?'; $lang->task->confirmRecord = '"Heures Restantes" à 0. Voulez-vous passer le statut de la tâche à "Finie" ?'; $lang->task->confirmTransfer = '"Heures Restantes" à 0. Voulez-vous transférer la tâche ?'; +$lang->task->noticeTaskStart = '"Cost Hour" and "Left Hour" cannot be 0 at the same time.'; $lang->task->noticeLinkStory = "Aucune Story n'est associée. Vous pouvez %s pour ce projet, alors %s."; $lang->task->noticeSaveRecord = "Votre temps n'a pas été sauvé. Enregistrez-le d'abord."; $lang->task->commentActions = '%s. %s, commenté par %s.'; diff --git a/module/task/lang/vi.php b/module/task/lang/vi.php index 3ec8195ed0..f1ed21861e 100644 --- a/module/task/lang/vi.php +++ b/module/task/lang/vi.php @@ -189,6 +189,7 @@ $lang->task->confirmChangeProject = "Nếu bạn thay đổi {$lang->projectCom $lang->task->confirmFinish = '"Còn lại" bằng 0. Bạn có muốn thay đổi tình trạng thành "Kết thúc"?'; $lang->task->confirmRecord = '"Còn lại" bằng 0. Bạn có muốn thiết lập nhiệm vụ thành "Kết thúc"?'; $lang->task->confirmTransfer = '"Còn lại" bằng 0，Bạn có muốn chuyển thành nhiệm vụ?'; +$lang->task->noticeTaskStart = '"Cost Hour" and "Left Hour" cannot be 0 at the same time.'; $lang->task->noticeLinkStory = "Không có câu chuyện liên kết. Bạn có thể %s cho dự án này, sau đó %s."; $lang->task->noticeSaveRecord = 'Số giờ làm của bạn chưa được lưu. Vui lòng lưu nó trước.'; $lang->task->commentActions = '%s. %s, nhận xét bởi %s.'; diff --git a/module/task/lang/zh-cn.php b/module/task/lang/zh-cn.php index 6d71b4beaa..e8c8ad037a 100644 --- a/module/task/lang/zh-cn.php +++ b/module/task/lang/zh-cn.php @@ -189,6 +189,7 @@ $lang->task->confirmChangeProject = "修改{$lang->projectCommon}会导致相 $lang->task->confirmFinish = '"预计剩余"为0，确认将任务状态改为"已完成"吗？'; $lang->task->confirmRecord = '"剩余"为0，任务将标记为"已完成"，您确定吗？'; $lang->task->confirmTransfer = '"当前剩余"为0，任务将被转交，您确定吗？'; +$lang->task->noticeTaskStart = '"总计消耗"和"预计剩余"不能同时为0'; $lang->task->noticeLinkStory = "没有可关联的相关{$lang->storyCommon}，您可以为当前项目%s，然后%s"; $lang->task->noticeSaveRecord = '您有尚未保存的工时记录，请先将其保存。'; $lang->task->commentActions = '%s. %s, 由 %s 添加备注。'; diff --git a/module/task/lang/zh-tw.php b/module/task/lang/zh-tw.php index b5495015a7..fe9e48300a 100644 --- a/module/task/lang/zh-tw.php +++ b/module/task/lang/zh-tw.php @@ -189,6 +189,7 @@ $lang->task->confirmChangeProject = "修改{$lang->projectCommon}會導致相 $lang->task->confirmFinish = '"預計剩餘"為0，確認將任務狀態改為"已完成"嗎？'; $lang->task->confirmRecord = '"剩餘"為0，任務將標記為"已完成"，您確定嗎？'; $lang->task->confirmTransfer = '"當前剩餘"為0，任務將被轉交，您確定嗎？'; +$lang->task->noticeTaskStart = '"總計消耗"和"預計剩餘"不能同時為0'; $lang->task->noticeLinkStory = "沒有可關聯的相關{$lang->storyCommon}，您可以為當前項目%s，然後%s"; $lang->task->noticeSaveRecord = '您有尚未保存的工時記錄，請先將其保存。'; $lang->task->commentActions = '%s. %s, 由 %s 添加備註。'; diff --git a/module/task/model.php b/module/task/model.php index ada7448de2..2d061549de 100644 --- a/module/task/model.php +++ b/module/task/model.php @@ -1232,6 +1232,11 @@ class taskModel extends model if($this->post->left == 0) { + if($task->consumed == 0) + { + dao::$errors[] = sprintf($this->lang->error->notempty, $this->lang->task->consumed); + return false; + } $task->status = 'done'; $task->finishedBy = $this->app->user->account; $task->finishedDate = helper::now(); diff --git a/module/task/view/start.html.php b/module/task/view/start.html.php index 78ed65c9ec..e5113e1237 100644 --- a/module/task/view/start.html.php +++ b/module/task/view/start.html.php @@ -14,6 +14,7 @@ task->confirmFinish);?> +task->noticeTaskStart);?>
Date: Wed, 12 Aug 2020 10:17:41 +0800 Subject: [PATCH 03/24] Fix bug #2585 --- module/task/control.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/module/task/control.php b/module/task/control.php index 2856f0b1f4..3af0829586 100644 --- a/module/task/control.php +++ b/module/task/control.php @@ -622,7 +622,7 @@ class task extends control } else { - $story = $this->story->getById($task->story); + $story = $this->story->getById($task->story, $task->storyVersion); $task->storySpec = empty($story) ? '' : $this->loadModel('file')->setImgSize($story->spec); $task->storyVerify = empty($story) ? '' : $this->loadModel('file')->setImgSize($story->verify); $task->storyFiles = $this->loadModel('file')->getByObject('story', $task->story); From d83123f10e97dd3ab8e3bf006467f40fab45bdd1 Mon Sep 17 00:00:00 2001 From: Yagami <976204163@qq.com> Date: Thu, 13 Aug 2020 09:30:00 +0800 Subject: [PATCH 04/24] * Delete unuse file. --- db/update12.4.1.sql | 1 - 1 file changed, 1 deletion(-) delete mode 100644 db/update12.4.1.sql diff --git a/db/update12.4.1.sql b/db/update12.4.1.sql deleted file mode 100644 index 3f6ade7a75..0000000000 --- a/db/update12.4.1.sql +++ /dev/null @@ -1 +0,0 @@ -ALTER TABLE `zt_user` ADD `type` char(30) NOT NULL AFTER `account`; From f3c3ad36477134276b29bf6a8ea141202656829e Mon Sep 17 00:00:00 2001 From: tianshujie98 Date: Thu, 13 Aug 2020 09:35:22 +0800 Subject: [PATCH 05/24] * Fix bug #2577. --- module/task/view/batchedit.html.php | 2 +- module/task/view/edit.html.php | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/module/task/view/batchedit.html.php b/module/task/view/batchedit.html.php index 8e70dd22e9..9bc469e2ad 100755 --- a/module/task/view/batchedit.html.php +++ b/module/task/view/batchedit.html.php @@ -88,7 +88,7 @@ ?> assignedTo != $this->app->user->account) ? "disabled='disabled'" : '';?> - + parent < 0) ? "disabled='disabled'" : '';?> task->estimate;?> - team) ? "disabled='disabled'" : '';?> + team) or $task->parent < 0) ? "disabled='disabled'" : '';?> estimate, "class='form-control' {$disabled}");?> @@ -193,7 +193,7 @@ task->left;?> - team) ? "disabled='disabled'" : '';?> + team) or $task->parent < 0) ? "disabled='disabled'" : '';?> left, "class='form-control' {$disabled}");?> From 595e3e35c4197313c79c4b89dd5b805bb427741b Mon Sep 17 00:00:00 2001 From: tianshujie98 Date: Thu, 13 Aug 2020 09:38:57 +0800 Subject: [PATCH 06/24] * Fix bug #2573. --- module/bug/model.php | 2 +- module/bug/view/browse.html.php | 37 ++++++++++++++++++--------- module/caselib/view/browse.html.php | 4 ++- module/my/view/bug.html.php | 22 ++++++++++------ module/my/view/story.html.php | 20 +++++++++------ module/my/view/todo.html.php | 21 +++++++++------ module/product/view/browse.html.php | 29 ++++++++++++++------- module/productplan/view/view.html.php | 2 +- module/project/view/all.html.php | 4 ++- module/project/view/story.html.php | 14 ++++++---- module/project/view/task.html.php | 19 ++++++++------ module/release/view/view.html.php | 11 +++++--- module/story/model.php | 20 ++++++++++++++- module/task/model.php | 4 +-- module/testcase/model.php | 18 ++++++++++++- module/testcase/view/browse.html.php | 25 +++++++++++++----- module/testtask/model.php | 16 +++++++++++- module/testtask/view/cases.html.php | 7 ++--- 18 files changed, 194 insertions(+), 81 deletions(-) diff --git a/module/bug/model.php b/module/bug/model.php index 18fe679913..0d83189197 100644 --- a/module/bug/model.php +++ b/module/bug/model.php @@ -2494,7 +2494,7 @@ class bugModel extends model $canBatchResolve = common::hasPriv('bug', 'batchResolve'); $canBatchAssignTo = common::hasPriv('bug', 'batchAssignTo'); - $canBatchAction = $canBatchEdit or $canBatchConfirm or $canBatchClose or $canBatchActivate or $canBatchChangeBranch or $canBatchChangeModule or $canBatchResolve or $canBatchAssignTo; + $canBatchAction = ($canBatchEdit or $canBatchConfirm or $canBatchClose or $canBatchActivate or $canBatchChangeBranch or $canBatchChangeModule or $canBatchResolve or $canBatchAssignTo); $canView = common::hasPriv('bug', 'view'); diff --git a/module/bug/view/browse.html.php b/module/bug/view/browse.html.php index 7697d91a08..ef3c1b5ab0 100644 --- a/module/bug/view/browse.html.php +++ b/module/bug/view/browse.html.php @@ -206,6 +206,17 @@ $currentBrowseType = isset($lang->bug->mySelects[$browseType]) && in_array($brow $setting = $this->datatable->getSetting('bug'); $widths = $this->datatable->setFixedFieldWidth($setting); $columns = 0; + + $canBatchEdit = common::hasPriv('bug', 'batchEdit'); + $canBatchConfirm = common::hasPriv('bug', 'batchConfirm'); + $canBatchClose = common::hasPriv('bug', 'batchClose'); + $canBatchActivate = common::hasPriv('bug', 'batchActivate'); + $canBatchChangeBranch = common::hasPriv('bug', 'batchChangeBranch'); + $canBatchChangeModule = common::hasPriv('bug', 'batchChangeModule'); + $canBatchResolve = common::hasPriv('bug', 'batchResolve'); + $canBatchAssignTo = common::hasPriv('bug', 'batchAssignTo'); + + $canBatchAction = ($canBatchEdit or $canBatchConfirm or $canBatchClose or $canBatchActivate or $canBatchChangeBranch or $canBatchChangeModule or $canBatchResolve or $canBatchAssignTo); ?> ';?> ' id='bugList' data-fixed-left-width='' data-fixed-right-width=''> @@ -219,7 +230,7 @@ $currentBrowseType = isset($lang->bug->mySelects[$browseType]) && in_array($brow if(common::checkNotCN() and $value->id == 'severity') $value->name = $lang->bug->severity; if(common::checkNotCN() and $value->id == 'pri') $value->name = $lang->bug->pri; if(common::checkNotCN() and $value->id == 'confirmed') $value->name = $lang->bug->confirmed; - $this->datatable->printHead($value, $orderBy, $vars); + $this->datatable->printHead($value, $orderBy, $vars, $canBatchAction); $columns ++; } } @@ -236,33 +247,35 @@ $currentBrowseType = isset($lang->bug->mySelects[$browseType]) && in_array($brow
';?>
+
+
createLink('bug', 'batchEdit', "productID=$productID&branch=$branch"); - $misc = common::hasPriv('bug', 'batchEdit') ? "onclick=\"setFormAction('$actionLink')\"" : "disabled='disabled'"; + $misc = $canBatchEdit ? "onclick=\"setFormAction('$actionLink')\"" : "disabled='disabled'"; echo html::commonButton($lang->edit, $misc); ?>
    createLink('bug', 'batchConfirm'); - $misc = common::hasPriv('bug', 'batchConfirm') ? "onclick=\"setFormAction('$actionLink', 'hiddenwin')\"" : ''; + $misc = $canBatchConfirm ? "onclick=\"setFormAction('$actionLink', 'hiddenwin')\"" : ''; echo "
  • " . html::a('javascript:;', $lang->bug->confirmBug, '', $misc) . "
    • "; - $class = common::hasPriv('bug', 'batchClose') ? '' : "class='disabled'"; + $class = $canBatchClose ? '' : "class='disabled'"; $actionLink = $this->createLink('bug', 'batchClose'); - $misc = common::hasPriv('bug', 'batchClose') ? "onclick=\"setFormAction('$actionLink', 'hiddenwin')\"" : ''; + $misc = $canBatchClose ? "onclick=\"setFormAction('$actionLink', 'hiddenwin')\"" : ''; echo "
  • " . html::a('javascript:;', $lang->bug->close, '', $misc) . "
    • "; - $class = common::hasPriv('bug', 'batchActivate') ? '' : "class='disabled'"; + $class = $canBatchActivate ? '' : "class='disabled'"; $actionLink = $this->createLink('bug', 'batchActivate', "productID=$productID&branch=$branch"); - $misc = common::hasPriv('bug', 'batchActivate') ? "onclick=\"setFormAction('$actionLink')\"" : ''; + $misc = $canBatchActivate ? "onclick=\"setFormAction('$actionLink')\"" : ''; echo "
  • " . html::a('javascript:;', $lang->bug->activate, '', $misc) . "
    • "; - $misc = common::hasPriv('bug', 'batchResolve') ? "id='resolveItem'" : ''; + $misc = $canBatchResolve ? "id='resolveItem'" : ''; if($misc) { echo "
  • " . html::a('javascript:;', $lang->bug->resolve, '', $misc); @@ -302,7 +315,7 @@ $currentBrowseType = isset($lang->bug->mySelects[$browseType]) && in_array($brow ?>
- session->currentProductType != 'normal'):?> + session->currentProductType != 'normal'):?>
8;?> @@ -330,7 +343,7 @@ $currentBrowseType = isset($lang->bug->mySelects[$browseType]) && in_array($brow
- +
8;?> @@ -358,7 +371,7 @@ $currentBrowseType = isset($lang->bug->mySelects[$browseType]) && in_array($brow
- +
10;?> diff --git a/module/caselib/view/browse.html.php b/module/caselib/view/browse.html.php index 2071d0642c..085d032cd5 100644 --- a/module/caselib/view/browse.html.php +++ b/module/caselib/view/browse.html.php @@ -97,7 +97,7 @@ js::set('flow', $config->global->flow); testcase->needReview or !empty($config->testcase->forceReview));?> - + recTotal}&recPerPage={$pager->recPerPage}";?>
@@ -155,7 +155,9 @@ js::set('flow', $config->global->flow);
+
+
createLink('testcase', 'batchEdit', "libID=$libID&branch=0&type=lib");?> diff --git a/module/my/view/bug.html.php b/module/my/view/bug.html.php index 56631222a1..6817643438 100644 --- a/module/my/view/bug.html.php +++ b/module/my/view/bug.html.php @@ -29,13 +29,20 @@
'> - +
- +
@@ -68,7 +75,7 @@
- +
@@ -105,23 +112,23 @@
- +
createLink('bug', 'batchEdit'); - $misc = common::hasPriv('bug', 'batchEdit') ? "onclick=\"setFormAction('$actionLink')\"" : "disabled='disabled'"; + $misc = $canBatchEdit ? "onclick=\"setFormAction('$actionLink')\"" : "disabled='disabled'"; echo html::commonButton($lang->edit, $misc); ?> createLink('bug', 'batchConfirm'); $misc = "onclick=\"setFormAction('$actionLink', 'hiddenwin')\""; echo html::commonButton($lang->bug->confirmBug, $misc); } - if(common::hasPriv('bug', 'batchClose')) + if($canBatchClose) { $actionLink = $this->createLink('bug', 'batchClose'); $misc = "onclick=\"setFormAction('$actionLink', 'hiddenwin')\""; @@ -129,7 +136,6 @@ } ?>
diff --git a/module/my/view/story.html.php b/module/my/view/story.html.php index a9a81570e2..64494635b8 100644 --- a/module/my/view/story.html.php +++ b/module/my/view/story.html.php @@ -32,13 +32,17 @@
- +
@@ -61,7 +65,7 @@ createLink('story', 'view', "id=$story->id");?>
- +
@@ -92,7 +96,7 @@
- +
@@ -104,7 +108,7 @@ echo html::commonButton($lang->edit, $misc); } ?> - +
    @@ -141,7 +145,7 @@
- +
- + createLink('story', 'batchClose'); $misc = "data-form-action=\"$actionLink\""; diff --git a/module/my/view/todo.html.php b/module/my/view/todo.html.php index cb0a43d53b..e111b1c577 100644 --- a/module/my/view/todo.html.php +++ b/module/my/view/todo.html.php @@ -52,12 +52,19 @@
+
- +
@@ -79,7 +86,7 @@
- +
@@ -128,23 +135,22 @@
- - +
createLink('todo', 'batchEdit', "from=myTodo&type=$type&account=$account&status=$status"); echo html::commonButton($lang->edit, "onclick=\"setFormAction('$actionLink')\""); } - if(common::hasPriv('todo', 'batchFinish')) + if($canBatchFinish) { $actionLink = $this->createLink('todo', 'batchFinish'); echo html::commonButton($lang->todo->finish, "onclick=\"setFormAction('$actionLink', 'hiddenwin')\""); } - if(common::hasPriv('todo', 'batchClose')) + if($canBatchClose) { $actionLink = $this->createLink('todo', 'batchClose'); echo html::commonButton($lang->todo->close, "onclick=\"setFormAction('$actionLink', 'hiddenwin')\""); @@ -160,7 +166,6 @@ } ?>
- show('right', 'pagerjs');?>
diff --git a/module/product/view/browse.html.php b/module/product/view/browse.html.php index ab806ef73a..976f3e0e0b 100644 --- a/module/product/view/browse.html.php +++ b/module/product/view/browse.html.php @@ -186,6 +186,17 @@ js::set('foldAll', $lang->project->treeLevel['root']); $setting = $this->datatable->getSetting('product'); $widths = $this->datatable->setFixedFieldWidth($setting); $columns = 0; + + $canBatchEdit = common::hasPriv('story', 'batchEdit'); + $canBatchClose = common::hasPriv('story', 'batchClose') and strtolower($browseType) != 'closedbyme' and strtolower($browseType) != 'closedstory'; + $canBatchReview = common::hasPriv('story', 'batchReview'); + $canBatchChangeStage = common::hasPriv('story', 'batchChangeStage'); + $canBatchChangeBranch = common::hasPriv('story', 'batchChangeBranch'); + $canBatchChangeModule = common::hasPriv('story', 'batchChangeModule'); + $canBatchChangePlan = common::hasPriv('story', 'batchChangePlan'); + $canBatchAssignTo = common::hasPriv('story', 'batchAssignTo'); + + $canBatchAction = ($canBatchEdit or $canBatchClose or $canBatchReview or $canBatchChangeStage or $canBatchChangeModule or $canBatchChangePlan or $canBatchAssignTo); ?> ';?> ' id='storyList' data-fixed-left-width='' data-fixed-right-width=''> @@ -196,7 +207,7 @@ js::set('foldAll', $lang->project->treeLevel['root']); { if($value->show) { - $this->datatable->printHead($value, $orderBy, $vars); + $this->datatable->printHead($value, $orderBy, $vars, $canBatchAction); $columns ++; } } @@ -224,11 +235,12 @@ js::set('foldAll', $lang->project->treeLevel['root']);
';?>
+
+
createLink('story', 'batchEdit', "productID=$productID&projectID=0&branch=$branch"); ?> @@ -236,13 +248,12 @@ js::set('foldAll', $lang->project->treeLevel['root']);
    createLink('story', 'batchClose', "productID=$productID&projectID=0"); $misc = $canBatchClose ? "onclick=\"setFormAction('$actionLink')\"" : ''; echo "
  • " . html::a('#', $lang->close, '', $misc) . "
    • "; - if(common::hasPriv('story', 'batchReview')) + if($canBatchReview) { echo "
  • "; echo html::a('javascript:;', $lang->story->review, '', "id='reviewItem'"); @@ -283,7 +294,7 @@ js::set('foldAll', $lang->project->treeLevel['root']); echo "
  • " . html::a('javascript:;', $lang->story->review, '', $class) . '
    • '; } - if(common::hasPriv('story', 'batchChangeBranch') and $this->session->currentProductType != 'normal') + if($canBatchChangeBranch and $this->session->currentProductType != 'normal') { $withSearch = count($branches) > 8; echo "
  • "; @@ -300,7 +311,7 @@ js::set('foldAll', $lang->project->treeLevel['root']); echo '
'; } - if(common::hasPriv('story', 'batchChangeStage')) + if($canBatchChangeStage) { echo "
  • "; echo html::a('javascript:;', $lang->story->stageAB, '', "id='stageItem'"); @@ -323,7 +334,7 @@ js::set('foldAll', $lang->project->treeLevel['root']);
    • - +
    8;?> @@ -350,7 +361,7 @@ js::set('foldAll', $lang->project->treeLevel['root']);
    - +
    project->treeLevel['root']);
    - +
    id}&type=story&orderBy=%s&link=$link¶m=$param"; ?> diff --git a/module/project/view/all.html.php b/module/project/view/all.html.php index 6615a4dac3..3cee0df800 100644 --- a/module/project/view/all.html.php +++ b/module/project/view/all.html.php @@ -27,15 +27,18 @@
    +
    ' data-ride='table'> recTotal}&recPerPage={$pager->recPerPage}&pageID={$pager->pageID}";?> @@ -53,7 +56,6 @@ - diff --git a/module/project/view/story.html.php b/module/project/view/story.html.php index e9da0845d0..0eaabc860d 100644 --- a/module/project/view/story.html.php +++ b/module/project/view/story.html.php @@ -110,12 +110,16 @@ id}&orderBy=%s&type=$type¶m=$param&recTotal={$pager->recTotal}&recPerPage={$pager->recPerPage}"; ?>
    +
    + idAB);?>     		project->name);?>
    - +
    @@ -146,7 +150,7 @@ ?>
    - + id => '')) . html::a(helper::createLink('story', 'view', "storyID=$story->id"), sprintf('%03d', $story->id));?> id);?> @@ -220,7 +224,7 @@
    - +
    diff --git a/module/project/view/task.html.php b/module/project/view/task.html.php index 293e613e39..e15273b344 100644 --- a/module/project/view/task.html.php +++ b/module/project/view/task.html.php @@ -209,6 +209,14 @@ js::set('foldAll', $lang->project->treeLevel['root']); } $widths = $this->datatable->setFixedFieldWidth($customFields); $columns = 0; + + $canBatchEdit = common::hasPriv('task', 'batchEdit', !empty(reset($tasks)) ? reset($tasks) : null); + $canBatchClose = (common::hasPriv('task', 'batchClose', !empty(reset($tasks)) ? reset($tasks) : null) and strtolower($browseType) != 'closed'); + $canBatchCancel = common::hasPriv('task', 'batchCancel', !empty(reset($tasks)) ? reset($tasks) : null); + $canBatchChangeModule = common::hasPriv('task', 'batchChangeModule', !empty(reset($tasks)) ? reset($tasks) : null); + $canBatchAssignTo = common::hasPriv('task', 'batchAssignTo', !empty(reset($tasks)) ? reset($tasks) : null); + + $canBatchAction = ($canBatchEdit or $canBatchClose or $canBatchCancel or $canBatchChangeModule or $canBatchAssignTo); ?> ';?> ' id='taskList' data-fixed-left-width='' data-fixed-right-width=''> @@ -219,7 +227,7 @@ js::set('foldAll', $lang->project->treeLevel['root']); { if($field->show) { - $this->datatable->printHead($field, $orderBy, $vars); + $this->datatable->printHead($field, $orderBy, $vars, $canBatchAction); $columns++; } } @@ -248,15 +256,10 @@ js::set('foldAll', $lang->project->treeLevel['root']); ';?>
    +
    +
    -
    createLink('task', 'batchEdit', "projectID=$projectID"); diff --git a/module/release/view/view.html.php b/module/release/view/view.html.php index 637469f0ee..adc95ec578 100644 --- a/module/release/view/view.html.php +++ b/module/release/view/view.html.php @@ -70,12 +70,15 @@
    - + id}&type=story&link=$link¶m=$param&orderBy=%s";?>
    - +
    @@ -96,7 +99,7 @@ createLink('story', 'view', "storyID=$story->id", '', true);?>
    - +
    @@ -131,7 +134,7 @@
    - +
    id"); $account = $this->app->user->account; @@ -2877,7 +2888,14 @@ class storyModel extends model switch($id) { case 'id': - echo html::checkbox('storyIdList', array($story->id => '')) . html::a(helper::createLink('story', 'view', "storyID=$story->id"), sprintf('%03d', $story->id)); + if($canBatchAction) + { + echo html::checkbox('storyIdList', array($story->id => '')) . html::a(helper::createLink('story', 'view', "storyID=$story->id"), sprintf('%03d', $story->id)); + } + else + { + printf('%03d', $story->id); + } break; case 'pri': echo ""; diff --git a/module/task/model.php b/module/task/model.php index ada7448de2..3cfc295206 100644 --- a/module/task/model.php +++ b/module/task/model.php @@ -2757,12 +2757,12 @@ class taskModel extends model public function printCell($col, $task, $users, $browseType, $branchGroups, $modulePairs = array(), $mode = 'datatable', $child = false) { $canBatchEdit = common::hasPriv('task', 'batchEdit', !empty($task) ? $task : null); - $canBatchClose = (common::hasPriv('task', 'batchClose', !empty($task) ? $task : null) && strtolower($browseType) != 'closedBy'); + $canBatchClose = (common::hasPriv('task', 'batchClose', !empty($task) ? $task : null) and strtolower($browseType) != 'closed'); $canBatchCancel = common::hasPriv('task', 'batchCancel', !empty($task) ? $task : null); $canBatchChangeModule = common::hasPriv('task', 'batchChangeModule', !empty($task) ? $task : null); $canBatchAssignTo = common::hasPriv('task', 'batchAssignTo', !empty($task) ? $task : null); - $canBatchAction = $canBatchEdit or $canBatchClose or $canBatchCancel or $canBatchChangeModule or $canBatchAssignTo; + $canBatchAction = ($canBatchEdit or $canBatchClose or $canBatchCancel or $canBatchChangeModule or $canBatchAssignTo); $storyChanged = (!empty($task->storyStatus) and $task->storyStatus == 'active' and $task->latestStoryVersion > $task->storyVersion and !in_array($task->status, array('cancel', 'closed'))); $canView = common::hasPriv('task', 'view'); diff --git a/module/testcase/model.php b/module/testcase/model.php index 796a9f77f1..c4ae2ca108 100644 --- a/module/testcase/model.php +++ b/module/testcase/model.php @@ -1392,6 +1392,15 @@ class testcaseModel extends model */ public function printCell($col, $case, $users, $branches, $modulePairs = array(), $browseType = '', $mode = 'datatable') { + $canBatchRun = common::hasPriv('testtask', 'batchRun'); + $canBatchEdit = common::hasPriv('testcase', 'batchEdit'); + $canBatchDelete = common::hasPriv('testcase', 'batchDelete'); + $canBatchCaseTypeChange = common::hasPriv('testcase', 'batchCaseTypeChange'); + $canBatchConfirmStoryChange = common::hasPriv('testcase', 'batchConfirmStoryChange'); + $canBatchChangeModule = common::hasPriv('testcase', 'batchChangeModule'); + + $canBatchAction = ($canBatchRun or $canBatchEdit or $canBatchDelete or $canBatchCaseTypeChange or $canBatchConfirmStoryChange or $canBatchChangeModule); + $canView = common::hasPriv('testcase', 'view'); $caseLink = helper::createLink('testcase', 'view', "caseID=$case->id&version=$case->version"); $account = $this->app->user->account; @@ -1420,7 +1429,14 @@ class testcaseModel extends model switch($id) { case 'id': - echo html::checkbox('caseIDList', array($case->id => '')) . html::a(helper::createLink('testcase', 'view', "caseID=$case->id"), sprintf('%03d', $case->id)); + if($canBatchAction) + { + echo html::checkbox('caseIDList', array($case->id => '')) . html::a(helper::createLink('testcase', 'view', "caseID=$case->id"), sprintf('%03d', $case->id)); + } + else + { + printf('%03d', $case->id); + } break; case 'pri': echo ""; diff --git a/module/testcase/view/browse.html.php b/module/testcase/view/browse.html.php index 082f7496e6..901e584c51 100644 --- a/module/testcase/view/browse.html.php +++ b/module/testcase/view/browse.html.php @@ -72,6 +72,15 @@ js::set('suiteID', $suiteID); $setting = $this->datatable->getSetting('testcase'); $widths = $this->datatable->setFixedFieldWidth($setting); $columns = 0; + + $canBatchRun = common::hasPriv('testtask', 'batchRun'); + $canBatchEdit = common::hasPriv('testcase', 'batchEdit'); + $canBatchDelete = common::hasPriv('testcase', 'batchDelete'); + $canBatchCaseTypeChange = common::hasPriv('testcase', 'batchCaseTypeChange'); + $canBatchConfirmStoryChange = common::hasPriv('testcase', 'batchConfirmStoryChange'); + $canBatchChangeModule = common::hasPriv('testcase', 'batchChangeModule'); + + $canBatchAction = ($canBatchRun or $canBatchEdit or $canBatchDelete or $canBatchCaseTypeChange or $canBatchConfirmStoryChange or $canBatchChangeModule); ?> ';?> ' id='caseList' data-fixed-left-width='' data-fixed-right-width='' data-checkbox-name='caseIDList[]'> @@ -82,7 +91,7 @@ js::set('suiteID', $suiteID); { if($value->show) { - $this->datatable->printHead($value, $orderBy, $vars); + $this->datatable->printHead($value, $orderBy, $vars, $canBatchAction); $columns ++; } } @@ -99,16 +108,18 @@ js::set('suiteID', $suiteID);
    ';?>
    +
    +
    createLink('testtask', 'batchRun', "productID=$productID&orderBy=$orderBy"); - $misc = common::hasPriv('testtask', 'batchRun') ? "onclick=\"setFormAction('$actionLink')\"" : "disabled='disabled'"; + $misc = $canBatchRun ? "onclick=\"setFormAction('$actionLink')\"" : "disabled='disabled'"; echo html::commonButton($lang->testtask->runCase, $misc); $actionLink = $this->createLink('testcase', 'batchEdit', "productID=$productID&branch=$branch"); - $misc = common::hasPriv('testcase', 'batchEdit') ? "onclick=\"setFormAction('$actionLink')\"" : "disabled='disabled'"; + $misc = $canBatchEdit ? "onclick=\"setFormAction('$actionLink')\"" : "disabled='disabled'"; echo html::commonButton($lang->edit, $misc); ?> @@ -128,14 +139,14 @@ js::set('suiteID', $suiteID); echo ''; } - if(common::hasPriv('testcase', 'batchDelete')) + if($canBatchDelete) { $actionLink = $this->createLink('testcase', 'batchDelete', "productID=$productID"); $misc = "onclick=\"confirmBatchDelete('$actionLink')\""; echo "
  • " . html::a('#', $lang->delete, '', $misc) . "
    • "; } - if(common::hasPriv('testcase', 'batchCaseTypeChange')) + if($canBatchCaseTypeChange) { echo "
  • "; echo html::a('javascript:;', $lang->testcase->type, '', "id='typeChangeItem'"); @@ -149,7 +160,7 @@ js::set('suiteID', $suiteID); echo '
    • '; } - if(common::hasPriv('testcase', 'batchConfirmStoryChange')) + if($canBatchConfirmStoryChange) { $actionLink = $this->createLink('testcase', 'batchConfirmStoryChange', "productID=$productID"); $misc = "onclick=\"setFormAction('$actionLink')\""; @@ -186,7 +197,7 @@ js::set('suiteID', $suiteID);
    - +
    10;?> diff --git a/module/testtask/model.php b/module/testtask/model.php index 8b1daa4546..9d1261efd0 100644 --- a/module/testtask/model.php +++ b/module/testtask/model.php @@ -1437,6 +1437,13 @@ class testtaskModel extends model */ public function printCell($col, $run, $users, $task, $branches, $mode = 'datatable') { + $canBatchEdit = common::hasPriv('testcase', 'batchEdit'); + $canBatchUnlink = common::hasPriv('testtask', 'batchUnlinkCases'); + $canBatchAssign = common::hasPriv('testtask', 'batchAssign'); + $canBatchRun = common::hasPriv('testtask', 'batchRun'); + + $canBatchAction = ($canBatchEdit or $canBatchUnlink or $canBatchAssign or $canBatchRun); + $canView = common::hasPriv('testcase', 'view'); $caseLink = helper::createLink('testcase', 'view', "caseID=$run->case&version=$run->version&from=testtask&taskID=$run->task"); $account = $this->app->user->account; @@ -1457,7 +1464,14 @@ class testtaskModel extends model switch ($id) { case 'id': - echo html::checkbox('caseIDList', array($run->case => sprintf('%03d', $run->case))); + if($canBatchAction) + { + echo html::checkbox('caseIDList', array($run->case => sprintf('%03d', $run->case))); + } + else + { + printf('%03d', $run->case); + } break; case 'pri': echo ""; diff --git a/module/testtask/view/cases.html.php b/module/testtask/view/cases.html.php index 90bcd4b547..492dbe3c03 100644 --- a/module/testtask/view/cases.html.php +++ b/module/testtask/view/cases.html.php @@ -39,7 +39,8 @@ $canBatchUnlink = common::hasPriv('testtask', 'batchUnlinkCases'); $canBatchAssign = common::hasPriv('testtask', 'batchAssign'); $canBatchRun = common::hasPriv('testtask', 'batchRun'); - $hasCheckbox = ($canBatchEdit or $canBatchUnlink or $canBatchAssign or $canBatchRun); + + $canBatchAction = ($canBatchEdit or $canBatchUnlink or $canBatchAssign or $canBatchRun); if($useDatatable) include '../../common/view/datatable.html.php'; if(!$useDatatable) include '../../common/view/tablesorter.html.php'; @@ -60,7 +61,7 @@ { if($value->show) { - $this->datatable->printHead($value, $orderBy, $vars); + $this->datatable->printHead($value, $orderBy, $vars, $canBatchAction); $columns ++; } } @@ -78,7 +79,7 @@ ';?>
    - +
    From f9ec465c8b701fdeb8821db61a9c9015ba99c23f Mon Sep 17 00:00:00 2001 From: holan20180123 <56391770@qq.com> Date: Thu, 13 Aug 2020 13:45:41 +0800 Subject: [PATCH 07/24] * Fix bug #3360. --- module/block/js/dashboard.js | 1 + 1 file changed, 1 insertion(+) diff --git a/module/block/js/dashboard.js b/module/block/js/dashboard.js index 4be23863ba..c5c235e104 100644 --- a/module/block/js/dashboard.js +++ b/module/block/js/dashboard.js @@ -66,6 +66,7 @@ function refreshBlock($panel, afterRefresh) { $panel.children('.panel-move-handler,style,script').remove(); $panel.find('.panel-body,.empty-tip').replaceWith($data); + $panel.find('.iframe').initIframeModal(); } $panel.find('.progress-pie').progressPie(); if($.isFunction(afterRefresh)) From b4512fd660459461ba9338550f4c488ed1cc96ad Mon Sep 17 00:00:00 2001 From: holan20180123 <56391770@qq.com> Date: Thu, 13 Aug 2020 13:47:23 +0800 Subject: [PATCH 08/24] * Fix bug #3276. --- module/bug/js/common.js | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/module/bug/js/common.js b/module/bug/js/common.js index 90ddf72002..bff09533b9 100644 --- a/module/bug/js/common.js +++ b/module/bug/js/common.js @@ -496,7 +496,8 @@ function notice() if(typeof(branch) == 'undefined') branch = 0; var link = createLink('release', 'create', 'productID=' + $('#product').val() + '&branch=' + branch); if(typeof(flow) != 'undefined' && flow == 'onlyTest') link = createLink('build', 'create','projectID=' + $('#product').val()); - html += '' + createBuild + ' '; + link += '?onlybody=yes'; + html += '' + createBuild + ' '; html += '' + refresh + ''; } else From 4040cbf092e278982680ab8dee026e95cd12d0a0 Mon Sep 17 00:00:00 2001 From: holan20180123 <56391770@qq.com> Date: Thu, 13 Aug 2020 13:47:44 +0800 Subject: [PATCH 09/24] * Fix bug #3292. --- module/doc/view/edit.html.php | 2 +- module/doc/view/view.html.php | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/module/doc/view/edit.html.php b/module/doc/view/edit.html.php index dac8d0749c..5e47a4c99b 100644 --- a/module/doc/view/edit.html.php +++ b/module/doc/view/edit.html.php @@ -38,7 +38,7 @@ doc->title;?> title, "class='form-control' required");?> - + doc->keywords;?> keywords, "class='form-control'");?> diff --git a/module/doc/view/view.html.php b/module/doc/view/view.html.php index be487669b5..51984fe68f 100644 --- a/module/doc/view/view.html.php +++ b/module/doc/view/view.html.php @@ -146,6 +146,7 @@ js::set('docID', $doc->id);
    +
    doc->keywords;?> From 99f7f0c4df5484bd7dac31af373421165589500e Mon Sep 17 00:00:00 2001 From: holan20180123 <56391770@qq.com> Date: Thu, 13 Aug 2020 13:48:29 +0800 Subject: [PATCH 10/24] * Fix bug #3276. --- module/release/control.php | 1 + 1 file changed, 1 insertion(+) diff --git a/module/release/control.php b/module/release/control.php index 937bb71647..915f48c213 100644 --- a/module/release/control.php +++ b/module/release/control.php @@ -70,6 +70,7 @@ class release extends control $this->executeHooks($releaseID); + if(isonlybody()) $this->send(array('result' => 'success', 'message' => $this->lang->saveSuccess, 'closeModal' => true, 'callback' => "parent.loadProductBuilds($productID)")); $this->send(array('result' => 'success', 'message' => $this->lang->saveSuccess, 'locate' => inlink('view', "releaseID=$releaseID"))); } From 7ac81c9b32f86769250052d949c00f37cde4044b Mon Sep 17 00:00:00 2001 From: holan20180123 <56391770@qq.com> Date: Thu, 13 Aug 2020 13:49:15 +0800 Subject: [PATCH 11/24] * Fix bug #3366. --- module/story/model.php | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/module/story/model.php b/module/story/model.php index 026deba7b6..70e6665994 100644 --- a/module/story/model.php +++ b/module/story/model.php @@ -830,7 +830,7 @@ class storyModel extends model if($data->pris[$storyID] == 'ditto') $data->pris[$storyID] = isset($prev['pri']) ? $prev['pri'] : 0; if(isset($data->branches) and $data->branches[$storyID] == 'ditto') $data->branches[$storyID] = isset($prev['branch']) ? $prev['branch'] : 0; if($data->modules[$storyID] == 'ditto') $data->modules[$storyID] = isset($prev['module']) ? $prev['module'] : 0; - if($data->plans[$storyID] == 'ditto') $data->plans[$storyID] = isset($prev['plan']) ? $prev['plan'] : 0; + if($data->plans[$storyID] == 'ditto') $data->plans[$storyID] = isset($prev['plan']) ? $prev['plan'] : ''; if($data->sources[$storyID] == 'ditto') $data->sources[$storyID] = isset($prev['source']) ? $prev['source'] : ''; if(isset($data->stages[$storyID]) and ($data->stages[$storyID] == 'ditto')) $data->stages[$storyID] = isset($prev['stage']) ? $prev['stage'] : ''; if(isset($data->closedBys[$storyID]) and ($data->closedBys[$storyID] == 'ditto')) $data->closedBys[$storyID] = isset($prev['closedBy']) ? $prev['closedBy'] : ''; @@ -875,7 +875,6 @@ class storyModel extends model if($story->stage != $oldStory->stage) $story->stagedBy = (strpos('tested|verified|released|closed', $story->stage) !== false) ? $this->app->user->account : ''; if($story->title != $oldStory->title and $story->status != draft) $story->status = 'changed'; - if($story->plan !== false and $story->plan == '') $story->plan = 0; if($story->closedBy != false and $oldStory->closedDate == '') $story->closedDate = $now; if($story->closedReason != false and $oldStory->closedDate == '') $story->closedDate = $now; if($story->closedBy != false or $story->closedReason != false) $story->status = 'closed'; From 4ae5a267711a2e8855c860ae84b5b6e937aae3a3 Mon Sep 17 00:00:00 2001 From: holan20180123 <56391770@qq.com> Date: Thu, 13 Aug 2020 13:51:34 +0800 Subject: [PATCH 12/24] * Fix bug #3364. --- module/task/view/view.html.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/module/task/view/view.html.php b/module/task/view/view.html.php index b3b9fd2430..fb26aa037e 100644 --- a/module/task/view/view.html.php +++ b/module/task/view/view.html.php @@ -83,7 +83,7 @@
    task->case;?>
      - cases as $caseID => $case) echo '
    • ' . html::a($this->createLink('testcase', 'view', "caseID=$caseID", '', true), "#$caseID " . $case, '', "data-toggle='modal' data-type='iframe' data-width='90%'") . '
      • ';?> + cases as $caseID => $case) echo '
    • ' . html::a($this->createLink('testcase', 'view', "caseID=$caseID", '', true), "#$caseID " . $case, '', isonlybody() ? '' : "data-toggle='modal' data-type='iframe' data-width='90%'") . '
      • ';?>
    From 2cecd03e0bca8135d7765f488dfc2cff29d5cba7 Mon Sep 17 00:00:00 2001 From: holan20180123 <56391770@qq.com> Date: Thu, 13 Aug 2020 13:52:00 +0800 Subject: [PATCH 13/24] * add new version and upgrade. --- db/update12.4.2.sql | 1 + 1 file changed, 1 insertion(+) create mode 100644 db/update12.4.2.sql diff --git a/db/update12.4.2.sql b/db/update12.4.2.sql new file mode 100644 index 0000000000..6a2312c954 --- /dev/null +++ b/db/update12.4.2.sql @@ -0,0 +1 @@ +update zt_story set `plan`='' where `plan`=0; From 1562d4415091dbdd261b62ac50c7d28432e5aadd Mon Sep 17 00:00:00 2001 From: qiyu-xie Date: Thu, 13 Aug 2020 13:55:38 +0800 Subject: [PATCH 14/24] Fix bug #3280 --- module/testreport/control.php | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/module/testreport/control.php b/module/testreport/control.php index 26599e1af6..e3e4ce9f69 100644 --- a/module/testreport/control.php +++ b/module/testreport/control.php @@ -441,10 +441,11 @@ class testreport extends control if($this->app->getViewType() == 'mhtml') $recPerPage = 10; $pager = pager::init($recTotal, $recPerPage, $pageID); - $tasks = $report->tasks ? $this->testtask->getByList($report->tasks) : array();; - $builds = $report->builds ? $this->build->getByList($report->builds) : array(); - $cases = $this->testreport->getTaskCases($tasks, $report->begin, $report->end, $report->cases, $pager); - $bugInfo = $this->testreport->getBugInfo($tasks, $report->product, $report->begin, $report->end, $builds); + $tasks = $report->tasks ? $this->testtask->getByList($report->tasks) : array();; + $builds = $report->builds ? $this->build->getByList($report->builds) : array(); + $cases = $this->testreport->getTaskCases($tasks, $report->begin, $report->end, $report->cases, $pager); + $totalCases = $this->testreport->getTaskCases($tasks, $report->begin, $report->end, $report->cases); + $bugInfo = $this->testreport->getBugInfo($tasks, $report->product, $report->begin, $report->end, $builds); if($report->objectType == 'testtask') { @@ -471,10 +472,10 @@ class testreport extends control $this->view->actions = $this->loadModel('action')->getList('testreport', $reportID); $this->view->storySummary = $this->product->summary($stories); - $this->view->caseSummary = $this->testreport->getResultSummary($tasks, $cases, $report->begin, $report->end); + $this->view->caseSummary = $this->testreport->getResultSummary($tasks, $totalCases, $report->begin, $report->end); - $perCaseResult = $this->testreport->getPerCaseResult4Report($tasks, $cases, $report->begin, $report->end); - $perCaseRunner = $this->testreport->getPerCaseRunner4Report($tasks, $cases, $report->begin, $report->end); + $perCaseResult = $this->testreport->getPerCaseResult4Report($tasks, $totalCases, $report->begin, $report->end); + $perCaseRunner = $this->testreport->getPerCaseRunner4Report($tasks, $totalCases, $report->begin, $report->end); $this->view->datas['testTaskPerRunResult'] = $this->loadModel('report')->computePercent($perCaseResult); $this->view->datas['testTaskPerRunner'] = $this->report->computePercent($perCaseRunner); From 03c00910aead4fb5750276f13e45e0601f7143b2 Mon Sep 17 00:00:00 2001 From: qiyu-xie Date: Fri, 14 Aug 2020 08:10:19 +0800 Subject: [PATCH 15/24] Fix bug #3342 --- module/testcase/view/view.html.php | 2 ++ 1 file changed, 2 insertions(+) diff --git a/module/testcase/view/view.html.php b/module/testcase/view/view.html.php index 11ae60e2c3..1f5bb8081c 100644 --- a/module/testcase/view/view.html.php +++ b/module/testcase/view/view.html.php @@ -16,8 +16,10 @@ ').append(t('
    ').addClass(i.attr("class")).append(n.clone())).insertAfter(i)),c){var d=h[0].getBoundingClientRect();l.css({left:d.left,width:h.width()}),l.find(".fixed-header-copy").css({left:o.left-d.left,position:"relative",minWidth:i.width()}),a||h.data("fixHeaderScroll")||(h.data("fixHeaderScroll",1),i.width()>h.width()&&h.on("scroll",function(){e.fixHeader()}))}else l.css({left:o.left,width:o.width});var u=l.find("th");n.find("th").each(function(e){u.eq(e).css("width",t(this).outerWidth())})}else l.remove()},r.prototype.fixFooter=function(){var e,i=this,n=i.getTable(),o=i.$.find(".table-footer");if(i.isDataTable)e=n[0].getBoundingClientRect();else{var a=n.find("tbody");if(!a.length)return;e=a[0].getBoundingClientRect()}var s=i.options.fixFooter;o.toggleClass("fixed-footer",!!r);var r=t.isFunction(s)?s(e,o):e.bottom>window.innerHeight-50-("number"==typeof s?s:i.pageFooterHeight||5);o.toggleClass("fixed-footer",!!r),n.toggleClass("with-footer-fixed",!!r),n.trigger("fixFooter",r);var l=t("body"),h=l.hasClass("body-modal");if(r){var c=n.parent(),d=c.is(".table-responsive");o.css({bottom:i.pageFooterHeight||0,left:d?c[0].getBoundingClientRect().left:e.left,width:d?c.width():e.width}),h&&l.css("padding-bottom",40)}else o.css({width:"",left:0,bottom:0}),h&&l.css("padding-bottom",0)},r.prototype.checkAll=function(e){var i=this,n=i.$.find(i.isDataTable?".fixed-left tbody>tr":"tbody>tr");n.each(function(){i.checkRow(t(this),e,!0)}),i.updateCheckUI()},r.prototype.checkRow=function(t,i,n){var o=this;o.isDataTable&&!t.is(".datatable-row-left")&&(t=o.getTable().find('.datatable-row-left[data-index="'+t.data("index")+'"]'));var a=t.find('input[type="checkbox"]');a.length&&(i===e&&(i=!a.is(":checked")),o.isDataTable?o.getTable().find('.datatable-row[data-index="'+t.data("index")+'"]').toggleClass("checked",i):t.toggleClass("checked",i),this.checkItems[t.data("id")]=i,a.prop("checked",i).trigger("change"),n||o.updateCheckUI())},r.prototype.updateCheckUI=function(){var e=this,i=e.getTable(),n=i.find(e.isDataTable?".fixed-left tbody>tr":"tbody>tr").not(".group-summary"),o=!1,a=null,s=0,r=!1,l=n.length;n.each(function(n){var h=t(this),c=h.find('input[type="checkbox"]');r=c.is(":checked");var d=e.isDataTable?i.find('.datatable-row[data-index="'+h.data("index")+'"]'):h;d.toggleClass("checked",r),d.toggleClass("row-check-begin",r&&!o),a&&a.toggleClass("row-check-end",!r&&o),r&&(s+=1),a=d,o=r,l===n+1&&d.toggleClass("row-check-end",r)}),e.$.toggleClass("has-row-checked",s>0).find(".check-all").toggleClass("checked",!(!l||s!==l)),e.updateStatistic(),e.options.onCheckChange&&e.options.onCheckChange()},r.DEFAULTS={checkable:!0,checkOnClickRow:!0,ajaxForm:!1,selectable:!0,fixHeader:!a,fixFooter:!a,iframeWidth:900,replaceId:"self",hot:!1,iframeModalTrigger:".iframe"},t.fn.table=function(e){return this.each(function(){var n=t(this),o=n.data(i),a="object"==typeof e&&e;o||n.data(i,o=new r(this,a)),"string"==typeof e&&o[e]()})},r.NAME=i,t.fn.table.Constructor=r,t(function(){t('[data-ride="table"]').table()})}(jQuery,void 0),function(t,e,i){t.fn._ajaxForm=t.fn.ajaxForm;var n={timeout:e.config?e.config.timeout:0,dataType:"json",method:"post"},o="",a="ja"===t.zui.clientLang()?"":";";t.fn.enableForm=function(e,n,o){return e===i&&(e=!0), +this.each(function(){var i=t(this);n||i.find('[type="submit"]').attr("disabled",e?null:"disabled"),!o&&i.hasClass("load-indicator")&&i.toggleClass("loading",!e),i.toggleClass("form-disabled",!e)})},t.enableForm=function(e,i,n,o){"string"==typeof e||e instanceof t?e=t(e):(o=n,n=i,i=e,e=t("form")),e.enableForm(i!==!1,n,o)},t.disableForm=function(e,i,n){t.enableForm(e,!1,i,n)};var s=function(e,i,n){"string"==typeof i&&(n=i,i=null),n=n||"show",t.zui.messager?t.zui.messager[n](e,i):alert(e)};t.ajaxForm=function(r,l){var h=t(r);if(h.length>1)return h.each(function(){t.ajaxForm(this,l)});t.isFunction(l)&&(l={complete:l}),l=t.extend({},n,h.data(),l);var c=l.beforeSubmit,d=l.error,u=l.success,p=l.finish;delete l.finish,delete l.success,delete l.onError,delete l.beforeSubmit,l=t.extend({beforeSubmit:function(n,a,s){if(h.enableForm(!1),(c&&c(n,a,s))!==!1){var r={},l=a.find('[type="file"]');r.fileapi=l.length&&l[0].files!==i,r.formdata=e.FormData!==i;var d=r.fileapi&&a.find('input[type="file"]:enabled').filter(function(){return""!==t(this).val()}),u=d.length,p="multipart/form-data",f=a.attr("enctype")==p||a.attr("encoding")==p,g=r.fileapi&&r.formdata,m=u&&!g||f&&!r.formdata;m&&(""==o&&(o=s.url),s.url!=o&&(s.url=o),s.url=s.url.indexOf("&")>=0?s.url+"&HTTP_X_REQUESTED_WITH=XMLHttpRequest":s.url+"?HTTP_X_REQUESTED_WITH=XMLHttpRequest")}},success:function(i,n,o){if((u&&u(i,n,o,h))!==!1){try{"string"==typeof i&&(i=JSON.parse(i))}catch(r){}if(null===i||"object"!=typeof i)return i?alert(i):s("No response.","danger");var c=l.responser?t(l.responser):h.find(".form-responser");c.length||(c=t("#responser"));var d=i.message,f=function(){var n=i.callback;if(n){var o=n.indexOf("("),a=(o>0?n.substr(0,o):n).split("."),s=e,r=a[0];a.length>1&&(r=a[1],"top"===a[0]?s=e.top:"parent"===a[0]&&(s=e.parent));var l=s[r];if(t.isFunction(l)){var c=[];return o>0&&")"==n[n.length-1]&&(c=t.parseJSON("["+n.substring(o+1,n.length-1)+"]")),c.push(i),l.apply(h,c)}}};if("success"===i.result){var g=l.locate||i.locate;if(h.enableForm(!0,!!g),d){var m=h.find('[type="submit"]').first(),v=!1;m.length&&(m.popover({container:"body",trigger:"manual",content:d,tipClass:"popover-in-modal popover-success popover-form-result",placement:i.placement||l.popoverPlacement||"right"}).popover("show"),setTimeout(function(){m.popover("destroy")},l.popoverTime||2e3),v=!0),c.length&&(c.html(''+d+"").show().delay(3e3).fadeOut(100),v=!0),v||s(d,"success")}if(p)return p(i,!0,h);if((l.closeModal||i.closeModal)&&setTimeout(t.zui.closeModal,l.closeModalTime||2e3),f()===!1)return;if(g)if("loadInModal"==g){var y=t(".modal");setTimeout(function(){y.load(y.attr("ref"),function(){t(this).find(".modal-dialog").css("width",t(this).data("width")),t.zui.ajustModalPosition()})},1e3)}else if("parent"===g||"top"===g)e[g]&&setTimeout(function(){e[g].location.reload()},1200);else{var b="reload"==g?e.location.href:g;setTimeout(function(){e.location.href=b},1200)}var w=l.ajaxReload||i.ajaxReload;if(w){var x=t(w);x.length&&x.load(e.location.href+" "+w,function(){x.find('[data-toggle="modal"]').modalTrigger()})}}else{if(h.enableForm(),"string"==typeof d)c.length?c.html(''+d+"").show().delay(3e3).fadeOut(100):s(d,"danger");else if("object"==typeof d){var C=!1,_=[];t.each(d,function(e,i){var n=t.isArray(i)?i.join(a):i,o=t("#"+e);if(!o.length)return void _.push(n);var s=e+"Label",r=t("#"+s);if(!r.length){var l=o.closest(".input-group").length,h=o.closest("td").length;r=t('
    ').appendTo(h?o.closest("td"):l?o.closest(".input-group").parent():o.parent())}r.empty().append(n),o.addClass("has-error");var c=function(){var e=t("#"+s);if(e.length)return e.remove(),o.removeClass("has-error"),!0};o.on("change input mousedown",c);var d=t("#"+e+"_chosen");if(d.length&&d.find(".chosen-single,.chosen-choices").addClass("has-error").on("mousedown",function(){c()===!0&&t(this).removeClass("has-error")}),!C){if(o.hasClass("chosen"))o.trigger("chosen:activate");else if(o.is("textarea")&&o.data("keditor")){var u=o.data("keditor");u.focus(),u.edit.doc.body.focus()}else o.focus();C=!0}}),_.length&&s(_.join(";"),"danger")}if(p)return p(i,!1,h);if(f()===!1)return}}},error:function(t,i,n){if((d&&d(t,i,n,h))!==!1){h.enableForm();var o="timeout"==i||"error"==i?e.lang?e.lang.timeout:i:t.responseText+i+n;s(o,"danger")}}},l),h._ajaxForm(l).data("zui.ajaxform",!0),h.on("click","[data-form-action]",function(){h.attr("action",t(this).data("formAction")).submit()})},t.setAjaxForm=function(e,i,n){t.ajaxForm(e,t.isPlainObject(i)?i:{onFinish:i,beforeSubmit:n})},t.fn.ajaxForm=function(e){return this.each(function(){t.ajaxForm(this,e)})},t.fn.setInputRequired=function(){return this.each(function(){var e=t(this),i=e.parent();i.is(".input-control,td")?i.addClass("required"):e.is(".chosen")?e.attr("required",null).next(".chosen-container").addClass("required"):i.addClass("required"),e.attr("required",null);var n=i.closest(".input-group");n.length&&1===n.find(".required,input[required],select[required]").length&&n.addClass("required")})},t(function(){t('.form-ajax,form[data-type="ajax"]').ajaxForm(),setTimeout(function(){var i=e.config.requiredFields,n=t("form");i&&(i=i.split(",")),i&&i.length&&t.each(i,function(t,e){n.find("#"+e).attr("required","required")}),n.find("input[required],select[required],textarea[required]").setInputRequired()},400),t("#hiddenwin"),t('form[target="hiddenwin"]').on("submit",function(){var e=t(this);e.data("zui.ajaxform")||e.enableForm(!1).data("disabledTime",(new Date).getTime())}).on("click",function(){var e=t(this),i=e.data("disabledTime");i&&(new Date).getTime()-i>1e4&&e.enableForm(!0).data("disabledTime",null)})})}(jQuery,window,void 0),function(t){"use strict";var e="zui.searchList",i=function(t,e){if(t&&t.length)for(var i=0;i
    ').append(s)),i.$menu.append(s),i.$menu.removeClass("loading"),i.isLoaded=!0,e&&e(!0)},error:function(){i.$menu.removeClass("loading").append('
    '+(n.errorText||window.lang&&window.lang.timeout)+"
    "),e&&e(!1)}},n.ajax))},n.prototype.scrollTo=function(t){t.length&&t[0].scrollIntoViewIfNeeded&&t[0].scrollIntoViewIfNeeded({behavior:"smooth"})},n.prototype.getItems=function(){return this.$.find(this.options.selector).addClass("search-list-item")},n.prototype.getActiveItem=function(){return this.getItems().filter(".active:first")},n.prototype.search=function(e){var n=this,o=void 0===e||null===e||""===e;n.$.toggleClass("has-search-text",!o);var a=n.getItems().removeClass("active");if(o)a.removeClass("hidden");else{var s=t.trim(e).split(" ");a.each(function(){var e=t(this),n=e.text()+" "+(e.data("key")||e.data("filter"));e.toggleClass("hidden",!i(s,n))})}n.scrollTo(a.not(".hidden").first().addClass("active"))},n.DEFAULTS={selector:".list-group a:not(.not-list-item)",searchBox:".search-box",onSelectItem:null},t.fn.searchList=function(i){return this.each(function(){var o=t(this),a=o.data(e),s="object"==typeof i&&i;a||o.data(e,a=new n(this,s)),"string"==typeof i&&a[i]()})},n.NAME=e,t.fn.searchList.Constructor=n,t(function(){t('[data-ride="searchList"]').searchList()})}(jQuery),function(t){"use strict";var e="zui.labelSelector",i=function(n,o){var a=this;a.name=e,a.$=t(n),o=a.options=t.extend({},i.DEFAULTS,this.$.data(),o),a.$.hide(),a.update()};i.prototype.select=function(t){t+="",this.$wrapper.find(".label.active").removeClass("active"),this.$wrapper.find('.label[data-value="'+t+'"]').addClass("active"),this.$.val(t).trigger("change")},i.prototype.update=function(){var e=this,i=e.options,n=e.$wrapper;if(!n){if(i.wrapper)n=t(i.wrapper);else{var o=e.$.next();n=o.hasClass(".label-selector")?o:t('
    ')}n.parent().length||e.$.after(n),e.$wrapper=n,n.on("click",".label",function(i){var n=e.$.val(),o=t(this).data("value");e.hasEmptyValue!==!1&&o==n&&(o=e.hasEmptyValue),e.select(o),i.preventDefault()})}n.empty();var a=e.$.val();e.hasEmptyValue=!1,e.$.children("option").each(function(){var e=t(this),o={label:e.text(),value:e.val()},s=""===o.value||"0"===o.value,r=t(i.labelTemplate||'');i.labelClass&&!s&&r.addClass(i.labelClass),i.labelCreator?r=i.labelCreator(r):(r.data("option",o).attr("data-value",o.value),s&&!o.label?r.addClass("empty").append(''):r.text(o.label).toggleClass("active",a===o.value)),n.append(r)})},i.DEFAULTS={},t.fn.labelSelector=function(n){return this.each(function(){var o=t(this),a=o.data(e),s="object"==typeof n&&n;a||o.data(e,a=new i(this,s)),"string"==typeof n&&a[n]()})},i.NAME=e,t.fn.labelSelector.Constructor=i,t(function(){t('[data-provide="labelSelector"]').labelSelector()})}(jQuery),function(t){"use strict";var e="zui.fileInput",i=t.BYTE_UNITS={B:1,KB:1024,MB:1048576,GB:1073741824,TB:1099511627776},n=t.formatBytes=function(t,e,n){return void 0===e&&(e=2),n||(n=ts.fileMaxSize&&(h.val(""),(window.bootbox||window).alert(s.fileSizeError.format(n(s.fileMaxSize)))),r.update()}),r.update()};a.prototype.getFile=function(){var t=this.$input.prop("files");return t&&t[0]},a.prototype.update=function(){var t=this,e=t.$,i=t.getFile(),o=!i;e.toggleClass("normal",!o).toggleClass("empty",o),i?(t.oldName=i.name,e.find(".file-title").text(i.name).attr("title",i.name),e.find(".file-size").text(n(i.size)),e.find(".file-editbox").val(i.name).attr("size",i.name.length),t.options.onSelect&&t.options.onSelect(i,t)):e.find(".file-editbox").val("")},a.DEFAULTS={fileMaxSize:0,fileSizeError:"无法上传大于 {0} 的文件。"},t.fn.fileInput=function(i){return this.each(function(){var n=t(this),o=n.data(e),s="object"==typeof i&&i;o||n.data(e,o=new a(this,s)),"string"==typeof i&&o[i]()})},a.NAME=e,t.fn.fileInput.Constructor=a,t(function(){t('[data-provide="fileInput"]').fileInput()});var s="zui.fileInputList",r=function(e,i){var n=this;n.name=s;var o=n.$=t(e);i=n.options=t.extend({},r.DEFAULTS,this.$.data(),i),n.$template=o.find(".file-input").detach(),n.add()};r.prototype.add=function(){var t=this,e=t.options,i=t.$template.clone();"before"===e.appendWay?t.$.prepend(i):t.$.append(i),i.fileInput({fileMaxSize:e.eachFileMaxSize,fileSizeError:e.fileSizeError,onDelete:function(e){e.$.remove(),t.options.onDelete&&t.options.onDelete(e,t)},onSelect:function(e,i){t.add(),t.options.onSelect&&t.options.onSelect(e,i,t)}})},r.DEFAULTS={fileMaxSize:0,eachFileMaxSize:0,appendWay:"after",fileSizeError:"无法上传大于 {0} 的文件。"},t.fn.fileInputList=function(e){return this.each(function(){var i=t(this),n=i.data(s),o="object"==typeof e&&e;n||i.data(s,n=new r(this,o)),"string"==typeof e&&n[e]()})},r.NAME=s,t.fn.fileInputList.Constructor=r,t(function(){t('[data-provide="fileInputList"]').fileInputList()})}(jQuery),function(t){window.config||(window.config={}),t.createLink=window.createLink=function(t,e,n,o,a,s){if(o||(o=config.defaultView),a||(a=!1),n)for(n=n.split("&"),i=0;i0?"&":"?")+"pgm="+s),l},t(function(){var e=t("#main,#mainContent,#mainRow,.auto-fade-in");e.length&&e.hasClass("fade")&&setTimeout(function(){e.addClass("in")},e.data("fadeTime")||200)}),t.ajaxSendScore=function(e){t.get(t.createLink("score","ajax","method="+e))};var e=function(t){var e=0;if(t){var i=t.split(":");e+=60*parseInt(i[0]),e+=parseInt(i[1])}return e},n=function(t){t%=1440;var e=Math.floor(t/60),i=t%60;return e<10&&(e="0"+e),i<10&&(i="0"+i),e+":"+i},o=function(t){if("string"==typeof t&&(t=e(t)),"number"==typeof t)if(t<1e5){var i=new Date;i.setHours(Math.floor(t/60)%24),i.setMinutes(t%60),t=i}else t=new Date(t);return t},a=function(t,i){for(var a=i?o(i):new Date,s=a.getHours(),r=10*Math.floor(a.getMinutes()/10)+10,l=0;l<24;++l){var h=(l+s)%24;if(!(h<5))for(var c=0;c<6;++c){var d=n(60*h+10*c+r);t.append('")}}t.val()||(time=e(a.format("hh:mm")),time=time-time%10+10,t.val(n(time)))};t.fn.timeSpanControl=function(i){return this.each(function(){var s=t(this),r=t.extend({},i,s.data()),l=s.find('[name="begin"],.control-time-begin'),h=s.find('[name="end"],.control-time-end'),c=function(){var t=l.val();if(s.find(".hide-empty-begin").toggleClass("hide",!t),t){var i=n(e(t)+30);h.find('option[value="'+i+'"]').length&&h.val(i),r.onChange&&r.onChange(h,i)}};if(s.data("timeSpanControlInit")){if(r.begin){var d=o(r.begin).format("hh:mm");l.find('option[value="'+d+'"]').length&&l.val(d),r.onChange&&r.onChange(l,d)}if(r.end){var u=o(r.end).format("hh:mm");h.find('option[value="'+u+'"]').length&&h.val(u),r.onChange&&r.onChange(h,u)}}else l.on("change",c),a(l,r.begin),a(h,r.end),s.data("timeSpanControlInit",!0);r.end||c()})},t.timeSpanControl={convertTimeToNum:e,convertNumToTime:n,initTimeSelect:a,createTime:o};var s=t.setSearchType=function(e,i){var n=t("#searchType");e||(e=n.val()),e=e||"bug",n.val(e);var o=t("#searchTypeMenu");o.find("li.selected").removeClass("selected");var a=o.find('a[data-value="'+e+'"]'),s=a.text();a.parent().addClass("selected"),t("#searchTypeName").text(s),i||t("#searchInput").focus()};t.gotoObject=function(e,i){if(e||(e=t("#searchType").val()),i||(i=t("#searchInput").val()),i&&e)if(i=i.replace(/[^\d]/g,""))window.location.href=t.createLink(e,"testsuite"===e?"library":"view","id="+i);else{var n={zh_cn:"请输入数字ID进行搜索",zh_tw:"請輸入數值ID行搜索"};alert(lang.searchTip||n[t.zui.clientLang()]||"Please enter a numberic id to search")}t("#searchInput").val(i).focus()},t(function(){s(null,!0),t(document).on("keydown",function(e){e.ctrlKey&&71===e.keyCode&&(t("#searchInput").val("").focus(),e.stopPropagation(),e.preventDefault())})}),t.removeAnchor=window.removeAnchor=function(t){var e=t.lastIndexOf("#");return e>-1?t.substr(0,e):t},t.refreshPage=function(){location.href=removeAnchor(location.href)},t.selectLang=window.selectLang=function(e){t.cookie("lang",e,{expires:config.cookieLife,path:config.webRoot}),t.ajaxSendScore("selectLang"),t.refreshPage()},t.selectTheme=window.selectTheme=function(e){t.cookie("theme",e,{expires:config.cookieLife,path:config.webRoot}),t.ajaxSendScore("selectTheme"),t.refreshPage()},t.zui.Picker&&t.zui.Picker.enableChosen(),t.chosenDefaultOptions={middle_highlight:!0,disable_search_threshold:1,compact_search:!0,allow_single_deselect:!0,placeholder_text_single:" ",placeholder_text_multiple:" ",search_contains:!0,max_drop_width:500,max_drop_height:245,no_wrap:!0,drop_direction:function(){var e=t(this.container).closest(".table-responsive:not(.scroll-none)");if(e.length){if(this.drop_directionFixed)return this.drop_directionFixed;var i="down",n=this.container.find(".chosen-drop"),o=this.container.position(),a=n.outerHeight();return o.top>=a&&o.top+a{page}/{totalPage}
    ',"next_icon","last_icon"],onPageChange:function(e,i){e.recPerPage!==i.recPerPage&&t.cookie(this.options.pageCookie,e.recPerPage,{expires:config.cookieLife,path:config.webRoot}),e.recPerPage!==i.recPerPage&&(window.location.href=this.createLink())}}),t.extend(!0,t.zui.Messager.DEFAULTS,{cssClass:"messagger-zt",icons:{success:"check-circle",info:"chat-line",warning:"exclamation-sign",danger:"exclamation-sign"}}),t.fn.reverseOrder=function(){return this.each(function(){var e=t(this);e.prependTo(e.parent())})};var r=function(e,i){var n=t(e);if(!n.data("historiesInited")){n.data("historiesInited",1),i=t.extend({},n.data(),i);var o=n.find(".histories-list"),a=!0,s=!1;n.on("click",".btn-reverse",function(){o.children("li").reverseOrder(),a=!a,t(this).find(".icon").toggleClass("icon-arrow-up",a).toggleClass("icon-arrow-down",!a);var e="#lastComment",i=t(e);i.length&&window.KindEditor&&(window.KindEditor.remove(e),i.kindeditor())}).on("click",".btn-expand-all",function(){var e=t(this).find(".icon");s=!s,e.toggleClass("icon-plus",!s).toggleClass("icon-minus",s),o.children("li").toggleClass("show-changes",s)}).on("click",".btn-expand",function(){t(this).closest("li").toggleClass("show-changes")}).on("click",".btn-strip",function(){var e=t(this),n=e.find(".icon"),o=n.hasClass("icon-code");n.toggleClass("icon-code",!o).toggleClass("icon-text",o),e.attr("title",o?i.original:i.textdiff),e.closest("li").toggleClass("show-original",o)}),o.find(".btn-strip").attr("title",i.original);var r=n.find(".modal-comment").modal({show:!1}).on("shown.zui.modal",function(){var t=r.find("#comment");t.length&&(t.focus(),window.editor&&window.editor.comment&&window.editor.comment.focus())}).on("show.zui.modal",function(){var e=r.find("#comment");e.length&&!e.data("keditor")&&t.fn.kindeditor&&e.kindeditor()});n.on("click",".btn-comment",function(t){r.modal("toggle"),t.preventDefault()}).on("click",".btn-edit-comment,.btn-hide-form",function(){t(this).closest("li").toggleClass("show-form")});var l=n.find(".comment-edit-form");l.ajaxForm({success:function(t,e,i,n){setTimeout(function(){l.closest("li").removeClass("show-form")},2e3)}})}};t.fn.histories=function(t){return this.each(function(){r(this,t)})},t(function(){t(".histories").histories()});var l=0,h=0;t.toggleSidebar=function(e){var i=t("#sidebar");if(i.length){var n=t("main");if(void 0===e)e=n.hasClass("hide-sidebar");else if(e&&!n.hasClass("hide-sidebar"))return;n.toggleClass("hide-sidebar",!e),clearTimeout(l),t.zui.store.set(h,e);var o=i.children(".cell"),a={overflow:"visible",maxHeight:"initial"};e?(i.addClass("showing"),l=setTimeout(function(){i.removeClass("showing"),i.trigger("sidebar.toggle",e)},210)):(i.trigger("sidebar.toggle",e),t(window).width()<1900&&(a={overflow:"hidden",maxHeight:t(window).height()-45})),o.css(a)}};var c=t.initSidebar=function(){var e=t("#sidebar");if(e.length){if(e.data("init"))return!0;h="sidebar:"+(e.data("id")||config.currentModule+"/"+config.currentMethod);var i=t("main");if(i.length){i.on("click",".sidebar-toggle",function(){t.toggleSidebar(i.hasClass("hide-sidebar"))});var n=t.zui.store.get(h,e.data("hide")!==!1);n===!1&&e.addClass("no-animate"),t.toggleSidebar(n),n===!1&&setTimeout(function(){e.removeClass("no-animate")},500);var o=e.find(".sidebar-toggle");if(o.length){var a=function(){var e=o[0].getBoundingClientRect(),i=t(window).height(),n=Math.max(0,Math.floor(Math.min(i-40,e.top+e.height)-Math.max(e.top,0))/2)+(e.top<0?0-e.top:0);o.removeClass("fade").find(".icon").css("top",n+(t.zui.browser.isIE()?(i-80)/2:0))};a(),e.data("init",1).on("sidebar.toggle",a);var s=t.zui.browser.isIE()?1500:0,r=0,l=null,c=function(){var t=Date.now();return l&&(clearTimeout(l),l=null),t-rtr input[type="checkbox"]:checked');i.each(function(){var i=parseInt(t(this).val(),10);NaN!==i&&e.push(i)}),t.cookie("checkedItem",e.join(","),{expires:config.cookieLife,path:config.webRoot})},t.extend(t.fn.modal.bs.Constructor.DEFAULTS,{scrollInside:!0,backdrop:"static",headerHeight:100}),t.extend(t.zui.ModalTrigger.DEFAULTS,{scrollInside:!0,backdrop:"static",headerHeight:40}),t.fn.initIframeModal=function(){return this.each(function(){var e=t(this);if(!e.parents('[data-ride="table"],.skip-iframe-modal').length){var i={type:"iframe"};e.hasClass("export")&&t.extend(i,{width:800,shown:setCheckedCookie},e.data()),e.modalTrigger(i)}})},t(function(){t("a.iframe,.export").initIframeModal()});var d=function(){var e,i,n=t(this),o=t.extend({limitSize:40,suffix:"…"},n.data()),a=n.text();if(a.length>o.limitSize){e=a,i=a.substr(0,o.limitSize)+o.suffix,n.text(i).addClass("limit-text-on");var s=o.toggleBtn?t(o.toggleBtn):n.next(".text-limit-toggle");s.text(s.data("textExpand")),s.on("click",function(){var t=n.toggleClass("limit-text-on").hasClass("limit-text-on");n.text(t?i:e),s.text(s.data(t?"textExpand":"textCollapse"))})}else(o.toggleBtn?t(o.toggleBtn):n.next(".text-limit-toggle")).hide()};t.fn.textLimit=function(){return this.each(d)},t(function(){t(".text-limit").textLimit()}),t.fixedTableHead=window.fixedTableHead=function(e,i){var n=t(e);if(n.is("table")||(n=n.find("table")),n.length){var o=t(i||window),a=null,s=function(){var e=n.children("thead"),i=e[0].getBoundingClientRect(),o=n.next(".fixed-head-table");if(i.top<0){var s=e.width();if(o.length){if(a!==s){a=s;var r=o.find("th");e.find("th").each(function(e){r.eq(e).width(t(this).width())})}}else{var o=t("
    ").addClass(n.attr("class")),l=e.clone(),r=l.find("th");e.find("th").each(function(e){r.eq(e).width(t(this).width())}),o.append(l).insertAfter(n)}o.css({left:i.left,width:i.width}).show()}else o.hide()};o.on("scroll",s).on("resize",s),s()}},t(document).on("click","tr[data-url]",function(){var e=t(this),i=e.data("href")||e.data("url");i&&(window.location.href=i)}),"yes"===config.onlybody&&self===parent&&(window.location.href=window.location.href.replace("?onlybody=yes","").replace("&onlybody=yes","")),t(function(){t("body").addClass("m-{currentModule}-{currentMethod}".format(config))});var u,p,f,g,m,v=function(){u||(u=t("#subNavbar"),p=t("#pageNav"),f=t("#pageActions"),g=u.children(".nav"),m=g.outerWidth());var e=u.outerWidth(),i=p.outerWidth()||0,n=f.outerWidth()||0;if(i=i?i+15:0,n=n?n+15:0,!i&&!n)return void g.css({maxWidth:null,left:null,position:"static"});var o=Math.max(300,e-i-n),a=Math.min(o,m),s=(e-a)/2,r=i&&s.btn-toolbar");if(e.length){var i,n,o=e.children(),a=o.length,s=!1,r=null;if(a)for(o.each(function(e){i=t(this),n=i.is(".divider"),n&&!r&&i.hide(),s||n||(s=!0),r=n?null:i,!n||e!==a-1&&0!==e||i.hide()});i.length&&i.is(".divider");)i=i.hide().prev();s||e.hide()}};t(function(){t(".input-group,.btn-group").fixInputGroup(),T()}),window.holders&&t.each(window.holders,function(e){var i=t("#"+e);i.length&&i.is("input")&&i.attr("placeholder",window.holders[e])});var S=function(){var e,i="en"==config.clientLang?"//www.zentao.pm/book/zentaomanual/8.html?fullScreen=zentao":"ja"==config.clientLang?"//www.zentao.jp/book/zentaomanual/8.html?fullScreen=zentao":"//www.zentao.net/book/zentaopmshelp.html?fullScreen=zentao",n=t("#navbar > .nav").first(),o=1e4,a=function(){clearTimeout(e),t("#helpContent").removeClass("show-error")},s=t.openHelp=function(s){s=s||i,a(),n.children("li.active:not(#helpMenuItem)").removeClass("active").addClass("close-help-tab"),t("#helpMenuItem").addClass("active");var r=t("#helpContent");if(r.length){if(t("body").hasClass("show-help-tab"))return void t("#helpIframe").get(0).contentWindow.location.replace(s)}else{r=t('

    '+lang.timeout+'

    '+s+'

    '),t("#header").after(r);var l=t("#helpIframe").get(0);e=setTimeout(function(){t("#helpContent").addClass("show-error")},o),l.onload=l.onreadystatechange=function(){this.readyState&&"complete"!=this.readyState||a()}}t("body").addClass("show-help-tab")},r=t.closeHelp=function(){t("body").removeClass("show-help-tab"),t("#helpMenuItem").removeClass("active"),n.find("li.close-help-tab").removeClass("close-help-tab").addClass("active").find("a").focus()};t(document).on("click",".open-help-tab",function(e){var i=t(this),o=t("#helpMenuItem");o.length||(o=t('
  • '+i.text()+'
    • '),n.append('
  • ').append(o)),s(i.attr("href")),e.preventDefault()}).on("click",".close-help-tab",function(t){r(),t.stopPropagation(),t.preventDefault()})};t(S),t(function(){var e=t(".table-responsive"),i=t.fixTableResponsive=function(){e.each(function(){this.scrollHeight-3<=this.clientHeight&&this.scrollWidth-3<=this.clientWidth?t(this).addClass("scroll-none").css("overflow","visible"):t(this).removeClass("scroll-none").css("overflow","auto")})};e.length&&(t(window).on("resize",i),setTimeout(i,100))});var D=function(){var e=this,i=t(e),n=i.closest("tr").find("textarea");if(n.length){var o=32; +n.each(function(){this.style.height="auto";var t=this.value?this.scrollHeight+2:32;o=Math.max(o,t)}),n.css("height",o)}else{e.style.height="auto";var a=e.value?e.scrollHeight+2:32;e.style.height=a+"px"}};t.autoResizeTextarea=function(e){t(e).each(D)},t(function(){t("textarea.autosize").each(D),t(document).on("input keyup paste change","textarea.autosize",D)}),t(function(){var e=t("#dropMenu,.drop-menu");e.length&&e.on("click",".toggle-right-col",function(e){t(this).closest("#dropMenu,.drop-menu").toggleClass("show-right-col"),e.stopPropagation(),e.preventDefault()})});var M="undefined"!=typeof InstallTrigger;t.zui.browser.firefox=M,t("html").toggleClass("is-firefox",M).toggleClass("not-firefox",!M),t(function(){var e=t("#mainContent>.main-col"),i=e.children(".main-actions");if(i.length){var n=i.prev();if(i.length&&n.length){t('
    ').css("height",i.outerHeight()).insertAfter(i);var o=function(){var e=n[0].getBoundingClientRect(),o=e.top+e.height+120>t(window).height();t("body").toggleClass("main-actions-fixed",o),o&&i.width(n.width())};t.resetToolbarPosition=o,o(),t(window).on("resize scroll",o)}}}),t(document).on("show.zui.modal",function(e){t("body.body-modal").length&&window.parent&&window.parent!==window&&t(e.target).is(".modal")&&window.parent.$("body").addClass("hide-modal-close")}).on("hidden.zui.modal",function(){t("body.body-modal").length&&window.parent&&window.parent!==window&&window.parent.$("body").removeClass("hide-modal-close")}),t(function(){var e=t(".dropdown-menu.with-search");e.length&&(e.find(".menu-search").on("click",function(t){return t.stopPropagation(),!1}),e.on("keyup change paste","input",function(){var e=t(this),i=e.closest(".dropdown-menu.with-search"),n=e.val().toLowerCase(),o=i.find(".option");""==n?o.removeClass("hide"):o.each(function(){var e=t(this);e.toggleClass("hide",e.text().toString().toLowerCase().indexOf(n)<0&&e.data("key").toString().toLowerCase().indexOf(n)<0)})}),e.parents(".dropdown-submenu").one("mouseenter",function(){var e=t(this).find(".dropdown-list")[0];e&&e.getBoundingClientRect&&setTimeout(function(){var t=270,i=e.getBoundingClientRect();i.top<0&&(t=Math.min(270,i.height)+i.top),e.style.maxHeight=Math.min(270,t)+"px"},50)})),t(".dropdown-menu.with-search .menu-search").on("click",function(t){return t.stopPropagation(),!1})})}(jQuery),$.zui.lang("de",{"zui.pager":{pageOfText:"Seite {0}",prev:"Zurück",next:"Nächste Seite",first:"Erste Seite",last:"Letzte Seite","goto":"Goto",pageOf:"Seite {page}",totalPage:"{totalPage} Seiten",totalCount:"Total: {recTotal} Artikel",pageSize:"{recPerPage} Artikel pro Seite",itemsRange:"Seiten {start} bis {end}",pageOfTotal:"Seite {page}/{totalPage}"},"zui.boards":{append2end:"Gehen Sie zum Ende"},"zui.browser":{tip:"Online. Sorgenfrei. Aktualisiere deinen Browser noch heute!"},"zui.calendar":{weekNames:["Son","Mon","Die","Mit","Don","Fri","Sam"],monthNames:["Jan","Feb","Mär","Apr","Mai","Jun","Jul","Aug","Sep","Okt","Nov","Dez"],today:"Heute",year:"{0}Jahr",month:"{0}Monat",yearMonth:"{0}-{1}"},"zui.chosenIcons":{emptyIcon:"[Kein Icon]",commonIcons:"Gemeinsame Symbole",webIcons:"Web-Symbol",editorIcons:"Editor-Symbol",directionalIcons:"Pfeil Zusammenfluss",otherIcons:"Andere Symbole"},"zui.colorPicker":{errorTip:"Kein gültiger Farbwert"},"zui.datagrid":{errorCannotGetDataFromRemote:"Daten vom Remote-Server ({0}) können nicht abgerufen werden.",errorCannotHandleRemoteData:"Die vom Remote-Server zurückgegebenen Daten können nicht verarbeitet werden."},"zui.guideViewer":{prevStep:"Vorheriger Schritt",nextStep:"Nächster Schritt"},"zui.tabs":{reload:"Neu laden",close:"Schliessen",closeOthers:"Schließen Sie andere Registerkarten",closeRight:"Schließen Sie die rechte Registerkarte",reopenLast:"Letzten geschlossenen Tab wiederherstellen",errorCannotFetchFromRemote:"Inhalt kann nicht vom Remote-Server abgerufen werden ({0})."},"zui.uploader":{},datetimepicker:{days:["Sonntag","Montag","Diensteg","Mittwoch","Donnerstag","Freitag","Samstag"],daysShort:["Son","Mon","Die","Mit","Don","Fri","Sam"],daysMin:["Son","Mon","Die","Mit","Don","Fri","Sam"],months:["Jan","Feb","Mär","Apr","Mai","Jun","Jul","Aug","Sep","Okt","Nov","Dez"],monthsShort:["Jan","Feb","Mär","Apr","Mai","Jun","Jul","Aug","Sep","Okt","Nov","Dez"],today:"Heute",suffix:[],meridiem:[]},chosen:{no_results_text:"Nicht gefunden"},bootbox:{OK:"OK",CANCEL:"Stornieren",CONFIRM:"Bestätigen"}}),$.zui.lang("fr",{"zui.pager":{pageOfText:"Page {0}",prev:"Prev",next:"Suivant",first:"First",last:"Last","goto":"Goto",pageOf:"Page {page}",totalPage:"{totalPage} pages",totalCount:"Total: {recTotal} items",pageSize:"{recPerPage} per page",itemsRange:"De {start} à {end}",pageOfTotal:"Page {page} de {totalPage}"},"zui.boards":{append2end:"Aller jusqu'au bout"},"zui.browser":{tip:"Naviguez sans crainte sur Internet. Mettez votre navigateur à jour dès aujourd'hui!"},"zui.calendar":{weekNames:["Dim","Lun","Mar","Mer","Jeu","Ven","Sam"],monthNames:["Jan","Fév","Mar","Avr","Mai","Juin","Juil","Août","Sep","Oct","Nov","Déc"],today:"Aujourd'hui",year:"{0} Année",month:"{0} Mois",yearMonth:"{0}-{1}"},"zui.chosenIcons":{emptyIcon:"[Aucune icône]",commonIcons:"Icônes communes",webIcons:"Icône Web",editorIcons:"Icône de l'éditeur",directionalIcons:"Flèche confluence",otherIcons:"Autres icônes"},"zui.colorPicker":{errorTip:"Pas une valeur de couleur valide"},"zui.datagrid":{errorCannotGetDataFromRemote:"Impossible d'obtenir les données du serveur distant ({0}).",errorCannotHandleRemoteData:"Impossible de traiter les données renvoyées par le serveur distant."},"zui.guideViewer":{prevStep:"Étape précédente",nextStep:"Prochaine étape"},"zui.tabs":{reload:"Recharger",close:"Fermer",closeOthers:"Fermez les autres onglets",closeRight:"Fermer l'onglet de droite",reopenLast:"Restaurer le dernier onglet fermé",errorCannotFetchFromRemote:"Impossible d'obtenir le contenu du serveur distant ({0})."},"zui.uploader":{},datetimepicker:{days:["Dimanche","Lundi","Mardi","Mercredi","Jeudi","Vendredi","Samedi"],daysShort:["Dim","Lun","Mar","Mer","Jeu","Ven","Sam"],daysMin:["Dim","Lun","Mar","Mer","Jeu","Ven","Sam"],months:["Jan","Fév","Mar","Avr","Mai","Juin","Juil","Août","Sep","Oct","Nov","Déc"],monthsShort:["Jan","Fév","Mar","Avr","Mai","Juin","Juil","Août","Sep","Oct","Nov","Déc"],today:"Aujourd'hui",suffix:[],meridiem:[]},chosen:{no_results_text:"Pas trouvé"},bootbox:{OK:"D'accord",CANCEL:"Annuler",CONFIRM:"Confirmer"}}); \ No newline at end of file From 4170ad49b521613cb6ee1828a4544232001f6a6d Mon Sep 17 00:00:00 2001 From: qiyu-xie Date: Mon, 17 Aug 2020 08:59:45 +0800 Subject: [PATCH 17/24] Fix bug #2582 --- module/task/lang/de.php | 2 +- module/task/lang/en.php | 2 +- module/task/lang/fr.php | 2 +- module/task/lang/vi.php | 2 +- module/task/lang/zh-cn.php | 2 +- module/task/lang/zh-tw.php | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/module/task/lang/de.php b/module/task/lang/de.php index eb2d6feac7..de2bb80c18 100644 --- a/module/task/lang/de.php +++ b/module/task/lang/de.php @@ -211,7 +211,7 @@ $lang->task->error->work = '"Bemerkung" muss kleiner als %d Zeichen $lang->task->error->skipClose = 'Aufgabe: %s ist nicht “Erledigt” oder “Abgebrochen”. Möchten Sie die Aufgabe jetzt schließen?'; $lang->task->error->consumed = 'Aufgabe: %s Hour must be more than 0. Ignore changes to this Task.'; $lang->task->error->assignedTo = 'Mehere Tasks können nicht zugewisen werden, da die Benutzer nicht teil des Teams sind.'; -$lang->task->error->consumedEmpty = '"Current Cost" should not be empty.'; +$lang->task->error->consumedEmpty = '"Current Cost" should not be 0.'; $lang->task->error->deadlineSmall = '"Deadline" must be greater than "StartDate".'; $lang->task->error->alreadyStarted = 'You cannot start this task, because it is started.'; diff --git a/module/task/lang/en.php b/module/task/lang/en.php index e05b6ba8c9..4e4acdba88 100644 --- a/module/task/lang/en.php +++ b/module/task/lang/en.php @@ -211,7 +211,7 @@ $lang->task->error->work = '"Comment" must be < %d characters.'; $lang->task->error->skipClose = 'Task: %s is not "Finished” or “Cancelled”. Do you want to close it?'; $lang->task->error->consumed = 'Task: %s hour must be < 0. Ignore changes to this task.'; $lang->task->error->assignedTo = 'Multi-user task in the current status cannot be assigned to a member who is not in the task team.'; -$lang->task->error->consumedEmpty = '"Current Cost" should not be empty.'; +$lang->task->error->consumedEmpty = '"Current Cost" should not be 0.'; $lang->task->error->deadlineSmall = '"Deadline" must be greater than "StartDate".'; $lang->task->error->alreadyStarted = 'You cannot start this task, because it is started.'; diff --git a/module/task/lang/fr.php b/module/task/lang/fr.php index d57e19697b..8e5b891b35 100644 --- a/module/task/lang/fr.php +++ b/module/task/lang/fr.php @@ -211,7 +211,7 @@ $lang->task->error->work = '"Commentaire" doit être < %d caractèr $lang->task->error->skipClose = 'Tâche: %s non “Finie” ou “Annulée”. Voulez-vous la fermer malgré tout ?'; $lang->task->error->consumed = 'Tâche: %s heures doivent être < 0. Ignorer changements de cette tâche.'; $lang->task->error->assignedTo = "Tâche Multi-user dans le statut courant ne peut pas être assignée à un membre qui ne fait pas partie de l'équipe."; -$lang->task->error->consumedEmpty = '"Coût Actuel" ne devrait pas être vide.'; +$lang->task->error->consumedEmpty = '"Coût Actuel" ne devrait pas être 0.'; $lang->task->error->deadlineSmall = '"Date Limite" doit être supérieur à la "Date de Départ".'; $lang->task->error->alreadyStarted = 'You cannot start this task, because it is started.'; diff --git a/module/task/lang/vi.php b/module/task/lang/vi.php index f1ed21861e..bf8e17bb6a 100644 --- a/module/task/lang/vi.php +++ b/module/task/lang/vi.php @@ -211,7 +211,7 @@ $lang->task->error->work = '"Nhận xét" phải là < %d ký tự. $lang->task->error->skipClose = 'Nhiệm vụ: %s không là "Kết thúc” hoặc “Đã hủy”. Bạn có muốn đóng nó?'; $lang->task->error->consumed = 'Nhiệm vụ: %s giờ phải là < 0. Bỏ qua thay đổi cho nhiệm vụ này.'; $lang->task->error->assignedTo = 'Nhiệm vụ nhiều người dùng trong tình trạng hiện tại không thể giao cho một thành viên người không trong Nhóm nhiệm vụ.'; -$lang->task->error->consumedEmpty = '"Giờ làm" không nên trống.'; +$lang->task->error->consumedEmpty = '"Giờ làm" không nên 0.'; $lang->task->error->deadlineSmall = '"Hạn chót" phải lớn hơn "Ngày bắt đầu".'; $lang->task->error->alreadyStarted = 'You cannot start this task, because it is started.'; diff --git a/module/task/lang/zh-cn.php b/module/task/lang/zh-cn.php index e8c8ad037a..4f80d67310 100644 --- a/module/task/lang/zh-cn.php +++ b/module/task/lang/zh-cn.php @@ -211,7 +211,7 @@ $lang->task->error->work = '"备注"必须小于%d个字符'; $lang->task->error->skipClose = '任务：%s 不是“已完成”或“已取消”状态，确定要关闭吗？'; $lang->task->error->consumed = '任务：%s工时不能小于0，忽略该任务工时的改动'; $lang->task->error->assignedTo = '当前状态的多人任务不能指派给任务团队外的成员。'; -$lang->task->error->consumedEmpty = '"本次消耗"不能为空'; +$lang->task->error->consumedEmpty = '"本次消耗"不能为0'; $lang->task->error->deadlineSmall = '"截止日期"必须大于"预计开始"'; $lang->task->error->alreadyStarted = '此任务已被启动，不能重复启动！'; diff --git a/module/task/lang/zh-tw.php b/module/task/lang/zh-tw.php index fe9e48300a..02e456a765 100644 --- a/module/task/lang/zh-tw.php +++ b/module/task/lang/zh-tw.php @@ -211,7 +211,7 @@ $lang->task->error->work = '"備註"必須小於%d個字元'; $lang->task->error->skipClose = '任務：%s 不是“已完成”或“已取消”狀態，確定要關閉嗎？'; $lang->task->error->consumed = '任務：%s工時不能小於0，忽略該任務工時的改動'; $lang->task->error->assignedTo = '當前狀態的多人任務不能指派給任務團隊外的成員。'; -$lang->task->error->consumedEmpty = '"本次消耗"不能為空'; +$lang->task->error->consumedEmpty = '"本次消耗"不能為0'; $lang->task->error->deadlineSmall = '"截止日期"必須大於"預計開始"'; $lang->task->error->alreadyStarted = '此任務已被啟動，不能重複啟動！'; From 8e964d56a1d96f7cb44a0e828a898b85d3fc7b9b Mon Sep 17 00:00:00 2001 From: holan20180123 <56391770@qq.com> Date: Mon, 17 Aug 2020 09:21:19 +0800 Subject: [PATCH 18/24] * Fix bug #3365. --- module/testcase/model.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/module/testcase/model.php b/module/testcase/model.php index c4ae2ca108..8f44e9bbc0 100644 --- a/module/testcase/model.php +++ b/module/testcase/model.php @@ -266,7 +266,7 @@ class testcaseModel extends model $type = $cases->type[$i] == 'ditto' ? $type : $cases->type[$i]; $pri = $cases->pri[$i] == 'ditto' ? $pri : $cases->pri[$i]; $cases->module[$i] = (int)$module; - $cases->story[$i] = (int)$story; + $cases->story[$i] = !empty($storyID) ? $storyID : (int)$story; $cases->type[$i] = $type; $cases->pri[$i] = $pri; } From 3f48c5c4ba9ca3c8ce5876a8af56076d987accb8 Mon Sep 17 00:00:00 2001 From: holan20180123 <56391770@qq.com> Date: Mon, 17 Aug 2020 09:21:49 +0800 Subject: [PATCH 19/24] * Fix bug #3359. --- module/custom/lang/de.php | 4 ++-- module/custom/lang/en.php | 4 ++-- module/custom/lang/fr.php | 4 ++-- module/custom/lang/vi.php | 4 ++-- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/module/custom/lang/de.php b/module/custom/lang/de.php index 747116ced6..42190ef5b9 100644 --- a/module/custom/lang/de.php +++ b/module/custom/lang/de.php @@ -151,8 +151,8 @@ $lang->custom->moduleName['project'] = $lang->projectCommon; $lang->custom->conceptQuestions['overview'] = "1. Which combination of management fits your company?"; $lang->custom->conceptQuestions['story'] = "2. Do you use the concept of requirement or user story in your company?"; -$lang->custom->conceptQuestions['requirementpoint'] = "3. Do you use hours or function points to make estimations in your company?"; -$lang->custom->conceptQuestions['storypoint'] = "3. Do you use hours or story points to make estimations in your company?"; +$lang->custom->conceptQuestions['requirementpoint'] = "2. Do you use hours or function points to make estimations in your company?"; +$lang->custom->conceptQuestions['storypoint'] = "2. Do you use hours or story points to make estimations in your company?"; $lang->custom->conceptOptions = new stdclass; diff --git a/module/custom/lang/en.php b/module/custom/lang/en.php index d932068625..1696ac25ed 100644 --- a/module/custom/lang/en.php +++ b/module/custom/lang/en.php @@ -151,8 +151,8 @@ $lang->custom->moduleName['project'] = $lang->projectCommon; $lang->custom->conceptQuestions['overview'] = "1. Which combination of management fits your company?"; $lang->custom->conceptQuestions['story'] = "2. Do you use the concept of requirement or user story in your company?"; -$lang->custom->conceptQuestions['requirementpoint'] = "3. Do you use hours or function points to make estimations in your company?"; -$lang->custom->conceptQuestions['storypoint'] = "3. Do you use hours or story points to make estimations in your company?"; +$lang->custom->conceptQuestions['requirementpoint'] = "2. Do you use hours or function points to make estimations in your company?"; +$lang->custom->conceptQuestions['storypoint'] = "2. Do you use hours or story points to make estimations in your company?"; $lang->custom->conceptOptions = new stdclass; diff --git a/module/custom/lang/fr.php b/module/custom/lang/fr.php index 1aa6eee03b..20969e4190 100644 --- a/module/custom/lang/fr.php +++ b/module/custom/lang/fr.php @@ -151,8 +151,8 @@ $lang->custom->moduleName['project'] = $lang->projectCommon; $lang->custom->conceptQuestions['overview'] = "1. Quelle combinaison de gestion convient le mieux à votre entreprise ?"; $lang->custom->conceptQuestions['story'] = "2. Utilisez-vous le concept d'exigence ou de user story dans votre entreprise ?"; -$lang->custom->conceptQuestions['requirementpoint'] = "3. Utilisez-vous des heures ou des points de fonction pour faire des estimations dans votre entreprise ?"; -$lang->custom->conceptQuestions['storypoint'] = "3. Utilisez-vous des heures ou des points de Story pour faire des estimations dans votre entreprise ?"; +$lang->custom->conceptQuestions['requirementpoint'] = "2. Utilisez-vous des heures ou des points de fonction pour faire des estimations dans votre entreprise ?"; +$lang->custom->conceptQuestions['storypoint'] = "2. Utilisez-vous des heures ou des points de Story pour faire des estimations dans votre entreprise ?"; $lang->custom->conceptOptions = new stdclass; diff --git a/module/custom/lang/vi.php b/module/custom/lang/vi.php index 7496e2dac1..07b2a984c1 100644 --- a/module/custom/lang/vi.php +++ b/module/custom/lang/vi.php @@ -151,8 +151,8 @@ $lang->custom->moduleName['project'] = $lang->projectCommon; $lang->custom->conceptQuestions['overview'] = "1. Sự kết hợp quản lý nào phù hợp với công ty của bạn?"; $lang->custom->conceptQuestions['story'] = "2. Bạn có sử dụng mô hình điều kiện hay câu chuyện người dùng trong doanh nghiệp của bạn?"; -$lang->custom->conceptQuestions['requirementpoint'] = "3. Do you use hours or function points to make estimations in your company?"; -$lang->custom->conceptQuestions['storypoint'] = "3. Bạn có dùng giờ hoặc điểm để tạo dự kiến trong doanh nghiệp của bạn ?"; +$lang->custom->conceptQuestions['requirementpoint'] = "2. Do you use hours or function points to make estimations in your company?"; +$lang->custom->conceptQuestions['storypoint'] = "2. Bạn có dùng giờ hoặc điểm để tạo dự kiến trong doanh nghiệp của bạn ?"; $lang->custom->conceptOptions = new stdclass; From b877163ef37914bcdd4e02a7a43f66f6fd72bb9e Mon Sep 17 00:00:00 2001 From: holan20180123 <56391770@qq.com> Date: Mon, 17 Aug 2020 09:22:33 +0800 Subject: [PATCH 20/24] * Fix bug #3358. --- module/common/model.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/module/common/model.php b/module/common/model.php index 20142a69d3..acd30bd074 100644 --- a/module/common/model.php +++ b/module/common/model.php @@ -1442,7 +1442,7 @@ EOD; $method = $this->app->rawMethod; } - if(!empty($this->app->user->modifyPassword) and (($module != 'my' or $method != 'changepassword') and ($module != 'user' or $method != 'logout'))) die(js::locate(helper::createLink('my', 'changepassword'))); + if(!empty($this->app->user->modifyPassword) and (($module != 'my' or $method != 'changepassword') and ($module != 'user' or $method != 'logout'))) die(js::locate(helper::createLink('my', 'changepassword', '', '', true))); if($this->isOpenMethod($module, $method)) return true; if(!$this->loadModel('user')->isLogon() and $this->server->php_auth_user) $this->user->identifyByPhpAuth(); if(!$this->loadModel('user')->isLogon() and $this->cookie->za) $this->user->identifyByCookie(); From a25560c573cff8f249958a76a259e8455376435e Mon Sep 17 00:00:00 2001 From: holan20180123 <56391770@qq.com> Date: Mon, 17 Aug 2020 09:22:58 +0800 Subject: [PATCH 21/24] * Fix bug #3276. --- module/bug/js/common.js | 2 +- module/bug/view/create.html.php | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/module/bug/js/common.js b/module/bug/js/common.js index bff09533b9..c7df4f8e3b 100644 --- a/module/bug/js/common.js +++ b/module/bug/js/common.js @@ -496,7 +496,7 @@ function notice() if(typeof(branch) == 'undefined') branch = 0; var link = createLink('release', 'create', 'productID=' + $('#product').val() + '&branch=' + branch); if(typeof(flow) != 'undefined' && flow == 'onlyTest') link = createLink('build', 'create','projectID=' + $('#product').val()); - link += '?onlybody=yes'; + link += requestType == 'GET' ? '&onlybody=yes' : '?onlybody=yes'; html += '' + createBuild + ' '; html += '' + refresh + ''; } diff --git a/module/bug/view/create.html.php b/module/bug/view/create.html.php index 42282830d6..2df0f04595 100644 --- a/module/bug/view/create.html.php +++ b/module/bug/view/create.html.php @@ -20,6 +20,7 @@ js::set('createRelease', $lang->release->create); js::set('createBuild', $lang->build->create); js::set('refresh', $lang->refresh); js::set('flow', $config->global->flow); +js::set('requestType', $config->requestType); ?>
    From fdf35bcce8700c0a6cb1aeabc02ad10594b24268 Mon Sep 17 00:00:00 2001 From: holan20180123 <56391770@qq.com> Date: Mon, 17 Aug 2020 09:23:14 +0800 Subject: [PATCH 22/24] * Fix bug #2961. --- module/action/model.php | 6 ------ 1 file changed, 6 deletions(-) diff --git a/module/action/model.php b/module/action/model.php index a62fe1c5ea..9ad34a1a44 100755 --- a/module/action/model.php +++ b/module/action/model.php @@ -856,12 +856,6 @@ class actionModel extends model if(strpos($action->objectLabel, '|') !== false) { list($objectLabel, $moduleName, $methodName, $vars) = explode('|', $action->objectLabel); - $action->objectLink = ''; - if(!common::hasPriv($moduleName, $methodName)) - { - unset($actions[$i]); - continue; - } $action->objectLink = helper::createLink($moduleName, $methodName, sprintf($vars, $action->objectID)); if($action->objectType == 'user') $action->objectLink = helper::createLink($moduleName, $methodName, sprintf($vars, $action->objectName)); From 89a4481f0b44fe2a373a6bd60c1717a4d594f7fa Mon Sep 17 00:00:00 2001 From: holan20180123 <56391770@qq.com> Date: Mon, 17 Aug 2020 09:45:55 +0800 Subject: [PATCH 23/24] * Fix bug #3276. --- module/bug/view/create.html.php | 1 - 1 file changed, 1 deletion(-) diff --git a/module/bug/view/create.html.php b/module/bug/view/create.html.php index 2df0f04595..42282830d6 100644 --- a/module/bug/view/create.html.php +++ b/module/bug/view/create.html.php @@ -20,7 +20,6 @@ js::set('createRelease', $lang->release->create); js::set('createBuild', $lang->build->create); js::set('refresh', $lang->refresh); js::set('flow', $config->global->flow); -js::set('requestType', $config->requestType); ?>
    From 0a32bb464f1faf962a17908c44e78ec053c785f0 Mon Sep 17 00:00:00 2001 From: holan20180123 <56391770@qq.com> Date: Mon, 17 Aug 2020 09:46:45 +0800 Subject: [PATCH 24/24] * Fix bug #3276. --- module/bug/js/common.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/module/bug/js/common.js b/module/bug/js/common.js index c7df4f8e3b..d648f95aa8 100644 --- a/module/bug/js/common.js +++ b/module/bug/js/common.js @@ -496,7 +496,7 @@ function notice() if(typeof(branch) == 'undefined') branch = 0; var link = createLink('release', 'create', 'productID=' + $('#product').val() + '&branch=' + branch); if(typeof(flow) != 'undefined' && flow == 'onlyTest') link = createLink('build', 'create','projectID=' + $('#product').val()); - link += requestType == 'GET' ? '&onlybody=yes' : '?onlybody=yes'; + link += config.requestType == 'GET' ? '&onlybody=yes' : '?onlybody=yes'; html += '' + createBuild + ' '; html += '' + refresh + ''; }