From 9314b238858a2abff6850692c345ecc753c87cab Mon Sep 17 00:00:00 2001 From: zenggang Date: Thu, 4 Aug 2022 02:48:29 +0000 Subject: [PATCH] * Fix bug#25998,26017 --- module/execution/view/batchedit.html.php | 2 +- module/project/css/execution.css | 4 ++++ module/project/js/execution.js | 15 ++++++++++----- module/testcase/model.php | 8 ++++---- 4 files changed, 19 insertions(+), 10 deletions(-) diff --git a/module/execution/view/batchedit.html.php b/module/execution/view/batchedit.html.php index a37f4b3145..b132bc9fbe 100755 --- a/module/execution/view/batchedit.html.php +++ b/module/execution/view/batchedit.html.php @@ -49,7 +49,7 @@ idAB;?> systemMode == 'new' and isset($project) and $project->model == 'scrum'):?> - execution->projectName;?> + execution->projectName;?> execution->$name;?> setCode) or $config->setCode == 1):?> diff --git a/module/project/css/execution.css b/module/project/css/execution.css index e2f4655b73..62600ca993 100644 --- a/module/project/css/execution.css +++ b/module/project/css/execution.css @@ -3,3 +3,7 @@ #executionsSummary {padding-left: 10px;} #mainMenu .pull-left .checkbox-primary {margin-top: 5px;} .main-table tbody>tr>td:first-child, .main-table thead>tr>th:first-child { padding-left: 8px; } + +th.table-nest-title-edit {padding-left: 50px !important;} +th.table-nest-title-edit .table-nest-toggle {left: 28px;} +th.table-nest-title .check-all {position: absolute; left: 15px; top: 7px;} diff --git a/module/project/js/execution.js b/module/project/js/execution.js index 2d050e7b6e..d8ea9e70b7 100644 --- a/module/project/js/execution.js +++ b/module/project/js/execution.js @@ -30,12 +30,13 @@ $(function() var checkedLength = $(":checkbox[name^='executionIDList']:checked").length; if(checkedLength > 0) $('#executionForm').addClass('has-row-checked'); - if(notCheckedLength == 0) $('.table-footer #checkAll').prop('checked', true); + if(notCheckedLength == 0) $('#executionForm .checkAll').prop('checked', true); if(checkedLength == 0) { - $('.table-footer #checkAll').prop('checked', false); + $('#executionForm .checkAll').prop('checked', false); $('#executionForm').removeClass('has-row-checked'); } + if(notCheckedLength > 0) $('#executionForm .checkAll').prop('checked', false); var summary = checkedExecutions.replace('%s', checkedLength); if(cilentLang == "en" && checkedLength < 2) summary = summary.replace('items', 'item'); @@ -54,11 +55,12 @@ $(function() }); - $(document).on('click', ".table-footer #checkAll", function() + $(document).on('click', "#executionForm .checkAll", function() { if($(this).prop('checked')) { $(":checkbox[name^='executionIDList']").prop('checked', true); + $("#executionForm .checkAll").prop('checked', true); $('#executionForm').addClass('has-row-checked'); var checkedLength = $(":checkbox[name^='executionIDList']:checked").length; var summary = checkedExecutions.replace('%s', checkedLength); @@ -72,6 +74,7 @@ $(function() else { $(":checkbox[name^='executionIDList']").prop('checked', false); + $("#executionForm .checkAll").prop('checked', false); $('#executionForm').removeClass('has-row-checked'); $('#executionSummary').removeClass('hidden'); $('#executionsSummary').addClass('hidden'); @@ -86,7 +89,7 @@ $(function() { $(this).prop('checked', false); }); - $('.table-footer #checkAll').prop('checked', false); + $('#executionsForm .checkAll').prop('checked', false); }, 10); }) @@ -195,13 +198,15 @@ function showEditCheckbox(show) }); if(show) { - var tableFooter = "
"; + $('.table-nest-title').prepend("
").addClass('table-nest-title-edit'); + var tableFooter = "
"; $('#executionForm').attr('action', createLink('execution', 'batchEdit')); $('.table-footer').prepend(tableFooter).show(); $('body').scroll(); } else { + $('.table-nest-title').removeClass('table-nest-title-edit').find('.check-all').remove(); $('#executionForm').find('.editCheckbox').remove(); if($('#executionForm .pager').length == 0) $('.table-footer').hide(); $('#executionForm').removeAttr('action'); diff --git a/module/testcase/model.php b/module/testcase/model.php index 2130aa43ea..0abc869e07 100644 --- a/module/testcase/model.php +++ b/module/testcase/model.php @@ -97,8 +97,8 @@ class testcaseModel extends model $step->parent = ($step->type == 'item') ? $parentStepID : 0; $step->case = $caseID; $step->version = 1; - $step->desc = htmlSpecialString($stepDesc); - $step->expect = $step->type == 'group' ? '' : htmlSpecialString($data->expects[$stepID]); + $step->desc = rtrim(htmlSpecialString($stepDesc)); + $step->expect = $step->type == 'group' ? '' : rtrim(htmlSpecialString($data->expects[$stepID])); $this->dao->insert(TABLE_CASESTEP)->data($step)->autoCheck()->exec(); if($step->type == 'group') $parentStepID = $this->dao->lastInsertID(); if($step->type == 'step') $parentStepID = 0; @@ -826,8 +826,8 @@ class testcaseModel extends model $step->parent = ($step->type == 'item') ? $parentStepID : 0; $step->case = $caseID; $step->version = $version; - $step->desc = htmlSpecialString($stepDesc); - $step->expect = $step->type == 'group' ? '' : htmlSpecialString($data->expects[$stepID]); + $step->desc = rtrim(htmlSpecialString($stepDesc)); + $step->expect = $step->type == 'group' ? '' : rtrim(htmlSpecialString($data->expects[$stepID])); $this->dao->insert(TABLE_CASESTEP)->data($step)->autoCheck()->exec(); if($step->type == 'group') $parentStepID = $this->dao->lastInsertID(); if($step->type == 'step') $parentStepID = 0;