From a8167ca6cc155f5610c8ccfeaa47239e58af7400 Mon Sep 17 00:00:00 2001 From: Ryon1211 Date: Mon, 18 Nov 2024 13:53:29 +0900 Subject: [PATCH 1/2] =?UTF-8?q?=E8=A8=AD=E5=AE=9A=E7=94=BB=E9=9D=A2?= =?UTF-8?q?=E3=81=A7=E3=81=AF=E9=81=B8=E6=8A=9E=E8=82=A2=E3=81=AE=E8=BF=BD?= =?UTF-8?q?=E5=8A=A0=E3=82=92=E3=81=A7=E3=81=8D=E3=82=8B=E3=82=88=E3=81=86?= =?UTF-8?q?=E3=81=AB=E4=BF=AE=E6=AD=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- layouts/v7/modules/Vtiger/resources/Utils.js | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/layouts/v7/modules/Vtiger/resources/Utils.js b/layouts/v7/modules/Vtiger/resources/Utils.js index 84763a8cd..1af8555ff 100644 --- a/layouts/v7/modules/Vtiger/resources/Utils.js +++ b/layouts/v7/modules/Vtiger/resources/Utils.js @@ -60,8 +60,10 @@ var vtUtils = { if(selectElement.attr('multiple') != 'undefined' && typeof params.closeOnSelect == 'undefined') { params.closeOnSelect = false; } - - if(selectElement.is('input') && !params.hasOwnProperty('createSearchChoice')) { + console.log(app.getModuleName(),app.getParentModuleName()); + if(selectElement.is('input') + && !params.hasOwnProperty('createSearchChoice') + && app.getParentModuleName() !== 'Settings') { params.createSearchChoice = null; } From 287e37a00e78553dea1c43113ec141b45feb8c74 Mon Sep 17 00:00:00 2001 From: Ryon1211 Date: Mon, 18 Nov 2024 14:03:56 +0900 Subject: [PATCH 2/2] =?UTF-8?q?=E8=A8=AD=E5=AE=9A=E7=94=BB=E9=9D=A2?= =?UTF-8?q?=E3=81=A7=E3=81=AF=E9=81=B8=E6=8A=9E=E8=82=A2=E3=81=AE=E8=BF=BD?= =?UTF-8?q?=E5=8A=A0=E3=82=92=E3=81=A7=E3=81=8D=E3=82=8B=E3=82=88=E3=81=86?= =?UTF-8?q?=E3=81=AB=E4=BF=AE=E6=AD=A3=E3=81=AE=E4=BF=AE=E6=AD=A3=E6=BC=8F?= =?UTF-8?q?=E3=82=8C=E3=82=92=E8=BF=BD=E5=8A=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- layouts/v7/modules/Vtiger/resources/Utils.js | 7 ++++--- resources/app.js | 5 ++++- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/layouts/v7/modules/Vtiger/resources/Utils.js b/layouts/v7/modules/Vtiger/resources/Utils.js index 1af8555ff..a8fe4ab36 100644 --- a/layouts/v7/modules/Vtiger/resources/Utils.js +++ b/layouts/v7/modules/Vtiger/resources/Utils.js @@ -60,10 +60,11 @@ var vtUtils = { if(selectElement.attr('multiple') != 'undefined' && typeof params.closeOnSelect == 'undefined') { params.closeOnSelect = false; } - console.log(app.getModuleName(),app.getParentModuleName()); + + // 複数選択肢項目で自由に選択肢を追加できないようにする（設定は除く） if(selectElement.is('input') - && !params.hasOwnProperty('createSearchChoice') - && app.getParentModuleName() !== 'Settings') { + && !params.hasOwnProperty('createSearchChoice') + && app.getParentModuleName() !== 'Settings') { params.createSearchChoice = null; } diff --git a/resources/app.js b/resources/app.js index a21f1c55b..74beb7909 100644 --- a/resources/app.js +++ b/resources/app.js @@ -278,7 +278,10 @@ var app = { params.closeOnSelect = false; } - if(selectElement.is('input') && !params.hasOwnProperty('createSearchChoice')) { + // 複数選択肢項目で自由に選択肢を追加できないようにする（設定は除く） + if(selectElement.is('input') + && !params.hasOwnProperty('createSearchChoice') + && app.getParentModuleName() !== 'Settings') { params.createSearchChoice = null; }