From 595e3e35c4197313c79c4b89dd5b805bb427741b Mon Sep 17 00:00:00 2001 From: tianshujie98 Date: Thu, 13 Aug 2020 09:38:57 +0800 Subject: [PATCH] * 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 @@ ';?>
    - +