From 27c312f7b4f3d7eba5207f313431193a84dac028 Mon Sep 17 00:00:00 2001 From: wangyidong Date: Mon, 16 May 2016 15:57:48 +0800 Subject: [PATCH] * fix bug for ajax delete in teatcase-browse page. --- module/bug/view/browse.html.php | 231 +++++++++++++------------- module/common/view/datatable.html.php | 5 +- module/testcase/model.php | 2 +- module/testcase/view/browse.html.php | 101 +++++------ module/testtask/model.php | 2 +- www/js/my.full.js | 11 +- 6 files changed, 175 insertions(+), 177 deletions(-) diff --git a/module/bug/view/browse.html.php b/module/bug/view/browse.html.php index aa8b7cbd96..85a8bc497e 100644 --- a/module/bug/view/browse.html.php +++ b/module/bug/view/browse.html.php @@ -103,124 +103,125 @@ js::set('bugBrowseType', ($browseType == 'bymodule' and $this->session->bugBrows $vars = "productID=$productID&branch=$branch&browseType=$browseType¶m=$param&orderBy=%s&recTotal={$pager->recTotal}&recPerPage={$pager->recPerPage}"; include $file2Include; ?> - - - cookie->windowWidth >= $this->config->wideSize ? 12 : 10; - if($browseType == 'needconfirm') $columns = 7; - ?> - - -
- -
- createLink('bug', 'batchEdit', "productID=$productID&branch=$branch"); - $misc = common::hasPriv('bug', 'batchEdit') ? "onclick=\"setFormAction('$actionLink')\"" : "disabled='disabled'"; - echo html::commonButton($lang->edit, $misc); - ?> - -
    + + + cookie->windowWidth >= $this->config->wideSize ? 12 : 10; + if($browseType == 'needconfirm') $columns = 7; + ?> + + +
    + +
    createLink('bug', 'batchConfirm'); - $misc = common::hasPriv('bug', 'batchConfirm') ? "onclick=\"setFormAction('$actionLink','hiddenwin')\"" : $class; - if($misc) echo "
  • " . html::a('javascript:;', $lang->bug->confirmBug, '', $misc) . "
    • "; - - $actionLink = $this->createLink('bug', 'batchClose'); - $misc = common::hasPriv('bug', 'batchClose') ? "onclick=\"setFormAction('$actionLink','hiddenwin')\"" : $class; - if($misc) echo "
  • " . html::a('javascript:;', $lang->bug->close, '', $misc) . "
    • "; - - if(common::hasPriv('bug', 'batchChangeModule')) - { - $withSearch = count($modules) > 8; - echo "
  • "; - echo html::a('javascript:;', $lang->bug->moduleAB, '', "id='moduleItem'"); - echo "
      "; - foreach($modules as $moduleId => $module) - { - $actionLink = $this->createLink('bug', 'batchChangeModule', "moduleID=$moduleId"); - echo "
    • " . html::a('#', $module, '', "onclick=\"setFormAction('$actionLink','hiddenwin')\"") . "
      • "; - } - if($withSearch) echo "
      • "; - echo '
    • '; - } - else - { - echo '
  • ' . html::a('javascript:;', $lang->bug->moduleAB, '', $class) . '
    • '; - } - - $misc = common::hasPriv('bug', 'batchResolve') ? "id='resolveItem'" : ''; - if($misc) - { - echo "
  • " . html::a('javascript:;', $lang->bug->resolve, '', $misc); - echo "
      "; - unset($lang->bug->resolutionList['']); - unset($lang->bug->resolutionList['duplicate']); - unset($lang->bug->resolutionList['tostory']); - foreach($lang->bug->resolutionList as $key => $resolution) - { - $actionLink = $this->createLink('bug', 'batchResolve', "resolution=$key"); - if($key == 'fixed') - { - $withSearch = count($builds) > 4; - echo "
    • "; - echo html::a('javascript:;', $resolution, '', "id='fixedItem'"); - echo "
        "; - unset($builds['']); - foreach($builds as $key => $build) - { - $actionLink = $this->createLink('bug', 'batchResolve', "resolution=fixed&resolvedBuild=$key"); - echo "
      • "; - echo html::a('javascript:;', $build, '', "onclick=\"setFormAction('$actionLink','hiddenwin')\""); - echo "
        • "; - } - if($withSearch) echo "
        • "; - echo '
      • '; - } - else - { - echo '
    • ' . html::a('javascript:;', $resolution, '', "onclick=\"setFormAction('$actionLink','hiddenwin')\"") . '
      • '; - } - } - echo '
    • '; - } - else - { - echo "
  • " . html::a('javascript:;', $lang->bug->resolve, '', $class); - } - - $canBatchAssignTo = common::hasPriv('bug', 'batchAssignTo'); - if($canBatchAssignTo && count($bugs)) - { - $withSearch = count($memberPairs) > 10; - $actionLink = $this->createLink('bug', 'batchAssignTo', "productID={$productID}&type=product"); - echo html::select('assignedTo', $memberPairs, '', 'class="hidden"'); - echo "
  • "; - echo html::a('javascript::', $lang->bug->assignedTo, 'id="assignItem"'); - echo "
      "; - foreach ($memberPairs as $key => $value) - { - if(empty($key)) continue; - echo "
    • " . html::a("javascript:$(\".table-actions #assignedTo\").val(\"$key\");setFormAction(\"$actionLink\")", $value, '', '') . '
      • '; - } - if($withSearch) echo "
      • "; - echo "
    "; - echo "
    • "; - } - else - { - echo "
  • " . html::a('javascript:;', $lang->bug->assignedTo, '', $class); - } + $actionLink = $this->createLink('bug', 'batchEdit', "productID=$productID&branch=$branch"); + $misc = common::hasPriv('bug', 'batchEdit') ? "onclick=\"setFormAction('$actionLink')\"" : "disabled='disabled'"; + echo html::commonButton($lang->edit, $misc); ?> -
+ +
    + createLink('bug', 'batchConfirm'); + $misc = common::hasPriv('bug', 'batchConfirm') ? "onclick=\"setFormAction('$actionLink','hiddenwin')\"" : $class; + if($misc) echo "
  • " . html::a('javascript:;', $lang->bug->confirmBug, '', $misc) . "
    • "; + + $actionLink = $this->createLink('bug', 'batchClose'); + $misc = common::hasPriv('bug', 'batchClose') ? "onclick=\"setFormAction('$actionLink','hiddenwin')\"" : $class; + if($misc) echo "
  • " . html::a('javascript:;', $lang->bug->close, '', $misc) . "
    • "; + + if(common::hasPriv('bug', 'batchChangeModule')) + { + $withSearch = count($modules) > 8; + echo "
  • "; + echo html::a('javascript:;', $lang->bug->moduleAB, '', "id='moduleItem'"); + echo "
      "; + foreach($modules as $moduleId => $module) + { + $actionLink = $this->createLink('bug', 'batchChangeModule', "moduleID=$moduleId"); + echo "
    • " . html::a('#', $module, '', "onclick=\"setFormAction('$actionLink','hiddenwin')\"") . "
      • "; + } + if($withSearch) echo "
      • "; + echo '
    • '; + } + else + { + echo '
  • ' . html::a('javascript:;', $lang->bug->moduleAB, '', $class) . '
    • '; + } + + $misc = common::hasPriv('bug', 'batchResolve') ? "id='resolveItem'" : ''; + if($misc) + { + echo "
  • " . html::a('javascript:;', $lang->bug->resolve, '', $misc); + echo "
      "; + unset($lang->bug->resolutionList['']); + unset($lang->bug->resolutionList['duplicate']); + unset($lang->bug->resolutionList['tostory']); + foreach($lang->bug->resolutionList as $key => $resolution) + { + $actionLink = $this->createLink('bug', 'batchResolve', "resolution=$key"); + if($key == 'fixed') + { + $withSearch = count($builds) > 4; + echo "
    • "; + echo html::a('javascript:;', $resolution, '', "id='fixedItem'"); + echo "
        "; + unset($builds['']); + foreach($builds as $key => $build) + { + $actionLink = $this->createLink('bug', 'batchResolve', "resolution=fixed&resolvedBuild=$key"); + echo "
      • "; + echo html::a('javascript:;', $build, '', "onclick=\"setFormAction('$actionLink','hiddenwin')\""); + echo "
        • "; + } + if($withSearch) echo "
        • "; + echo '
      • '; + } + else + { + echo '
    • ' . html::a('javascript:;', $resolution, '', "onclick=\"setFormAction('$actionLink','hiddenwin')\"") . '
      • '; + } + } + echo '
    • '; + } + else + { + echo "
  • " . html::a('javascript:;', $lang->bug->resolve, '', $class); + } + + $canBatchAssignTo = common::hasPriv('bug', 'batchAssignTo'); + if($canBatchAssignTo && count($bugs)) + { + $withSearch = count($memberPairs) > 10; + $actionLink = $this->createLink('bug', 'batchAssignTo', "productID={$productID}&type=product"); + echo html::select('assignedTo', $memberPairs, '', 'class="hidden"'); + echo "
  • "; + echo html::a('javascript::', $lang->bug->assignedTo, 'id="assignItem"'); + echo "
      "; + foreach ($memberPairs as $key => $value) + { + if(empty($key)) continue; + echo "
    • " . html::a("javascript:$(\".table-actions #assignedTo\").val(\"$key\");setFormAction(\"$actionLink\")", $value, '', '') . '
      • '; + } + if($withSearch) echo "
      • "; + echo "
    "; + echo "
    • "; + } + else + { + echo "
  • " . html::a('javascript:;', $lang->bug->assignedTo, '', $class); + } + ?> +
+
- - -
show();?>
- - - + +
show();?>
+ + + + - - + diff --git a/module/testcase/model.php b/module/testcase/model.php index fb57c41396..6c29a6c977 100644 --- a/module/testcase/model.php +++ b/module/testcase/model.php @@ -1016,7 +1016,7 @@ class testcaseModel extends model if(common::hasPriv('testcase', 'delete')) { $deleteURL = helper::createLink('testcase', 'delete', "caseID=$case->id&confirm=yes"); - echo html::a("javascript:ajaxDelete(\"$deleteURL\",\"caseList\",confirmDelete)", '', '', "title='{$this->lang->testcase->delete}' class='btn-icon'"); + echo html::a("javascript:ajaxDelete(\"$deleteURL\",\"batchForm\",confirmDelete)", '', '', "title='{$this->lang->testcase->delete}' class='btn-icon'"); } common::printIcon('testcase', 'createBug', "product=$case->product&branch=$case->branch&extra=caseID=$case->id,version=$case->version,runID=", $case, 'list', 'bug', '', 'iframe'); diff --git a/module/testcase/view/browse.html.php b/module/testcase/view/browse.html.php index 8f212cf6e1..258bbe3306 100644 --- a/module/testcase/view/browse.html.php +++ b/module/testcase/view/browse.html.php @@ -44,59 +44,60 @@ js::set('batchDelete', $lang->testcase->confirmBatchDelete); $vars = "productID=$productID&branch=$branch&browseType=$browseType¶m=$param&orderBy=%s&recTotal={$pager->recTotal}&recPerPage={$pager->recPerPage}"; include $file2Include; ?> - - - - - -
- -
- + + + + +
+ +
+ createLink('testcase', 'batchEdit', "productID=$productID&branch=$branch"); - $misc = common::hasPriv('testcase', 'batchEdit') ? "onclick=\"setFormAction('$actionLink')\"" : "disabled='disabled'"; - echo html::commonButton($lang->edit, $misc); - ?> - - + + +
-
- -
show();?>
- - - + +
show();?>
+ + + +