From 2f751595cca29e7331e0960d7175baa7967c8bb4 Mon Sep 17 00:00:00 2001 From: tianshujie Date: Thu, 19 May 2022 16:25:58 +0800 Subject: [PATCH] * Resoled issue #640. --- module/testcase/js/batchcreate.js | 15 +++++++++++++++ module/testcase/js/batchedit.js | 15 +++++++++++++++ module/testcase/view/batchcreate.html.php | 1 + module/testcase/view/batchedit.html.php | 1 + 4 files changed, 32 insertions(+) diff --git a/module/testcase/js/batchcreate.js b/module/testcase/js/batchcreate.js index 009b944c14..8a788bd65a 100644 --- a/module/testcase/js/batchcreate.js +++ b/module/testcase/js/batchcreate.js @@ -26,4 +26,19 @@ $(document).ready(function() inputFocusJump('down'); } }); + + $('#customField').click(function() + { + $('#formSettingForm > .checkboxes > .checkbox-primary > input').each(function() + { + var field = ',' + $(this).val() + ','; + var required = ',' + requiredFields + ','; + if(required.indexOf(field) >= 0) $(this).attr('disabled', 'disabled'); + }); + }); + + $('#formSettingForm .btn-primary').click(function() + { + $('#formSettingForm > .checkboxes > .checkbox-primary > input').removeAttr('disabled'); + }); }); diff --git a/module/testcase/js/batchedit.js b/module/testcase/js/batchedit.js index 94f8c09890..280f5d2e45 100644 --- a/module/testcase/js/batchedit.js +++ b/module/testcase/js/batchedit.js @@ -113,6 +113,21 @@ $(function() }); }); } + + $('#customField').click(function() + { + $('#formSettingForm > .checkboxes > .checkbox-primary > input').each(function() + { + var field = ',' + $(this).val() + ','; + var required = ',' + requiredFields + ','; + if(required.indexOf(field) >= 0) $(this).attr('disabled', 'disabled'); + }); + }); + + $('#formSettingForm .btn-primary').click(function() + { + $('#formSettingForm > .checkboxes > .checkbox-primary > input').removeAttr('disabled'); + }); }); $(document).on('click', '.chosen-with-drop', function(){oldValue = $(this).prev('select').val();})//Save old value. diff --git a/module/testcase/view/batchcreate.html.php b/module/testcase/view/batchcreate.html.php index a9102056f6..3a225bceb2 100644 --- a/module/testcase/view/batchcreate.html.php +++ b/module/testcase/view/batchcreate.html.php @@ -14,6 +14,7 @@ testcase->batchCreate);?> +testcase->create->requiredFields)?>

diff --git a/module/testcase/view/batchedit.html.php b/module/testcase/view/batchedit.html.php index 8a7aca5fb6..e4ab1fabde 100644 --- a/module/testcase/view/batchedit.html.php +++ b/module/testcase/view/batchedit.html.php @@ -16,6 +16,7 @@ testcase->confirmUnlinkTesttask);?> +testcase->edit->requiredFields)?>

testcase->common . $lang->colon . $lang->testcase->batchEdit;?>