From 6dbc3c5aaa8c0c6bedc61757985448dc1bb5474a Mon Sep 17 00:00:00 2001 From: Gregor Lasnibat Date: Wed, 4 Oct 2023 14:03:42 +0200 Subject: [PATCH] Fixed edit date/datetime columns range option selection [SCI-9418] Fixed edit date/datetime columns range option selection [SCI-9418] --- .../repository_columns/columns_initializers/date_column.js | 3 ++- .../columns_initializers/date_time_column.js | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/app/assets/javascripts/repository_columns/columns_initializers/date_column.js b/app/assets/javascripts/repository_columns/columns_initializers/date_column.js index 0fc2d61ff..656861054 100644 --- a/app/assets/javascripts/repository_columns/columns_initializers/date_column.js +++ b/app/assets/javascripts/repository_columns/columns_initializers/date_column.js @@ -17,7 +17,8 @@ var RepositoryDateColumnType = (function() { $modal.on('change', `${columnContainer} #date-reminder, ${columnContainer} #date-range`, function() { let reminderCheckbox = $(columnContainer).find('#date-reminder'); let rangeCheckbox = $(columnContainer).find('#date-range'); - rangeCheckbox.attr('disabled', reminderCheckbox.is(':checked')); + const isExistingRecord = $('#new-repo-column-submit').css('display') === 'none'; + rangeCheckbox.attr('disabled', isExistingRecord || reminderCheckbox.is(':checked')); reminderCheckbox.attr('disabled', rangeCheckbox.is(':checked')); $(columnContainer).find('.reminder-group').toggleClass('hidden', !reminderCheckbox.is(':checked')); }); diff --git a/app/assets/javascripts/repository_columns/columns_initializers/date_time_column.js b/app/assets/javascripts/repository_columns/columns_initializers/date_time_column.js index c041126b0..69991c52a 100644 --- a/app/assets/javascripts/repository_columns/columns_initializers/date_time_column.js +++ b/app/assets/javascripts/repository_columns/columns_initializers/date_time_column.js @@ -17,7 +17,8 @@ var RepositoryDateTimeColumnType = (function() { $modal.on('change', `${columnContainer} #datetime-reminder, ${columnContainer} #datetime-range`, function() { let reminderCheckbox = $(columnContainer).find('#datetime-reminder'); let rangeCheckbox = $(columnContainer).find('#datetime-range'); - rangeCheckbox.attr('disabled', reminderCheckbox.is(':checked')); + const isExistingRecord = $('#new-repo-column-submit').css('display') === 'none'; + rangeCheckbox.attr('disabled', isExistingRecord || reminderCheckbox.is(':checked')); reminderCheckbox.attr('disabled', rangeCheckbox.is(':checked')); $(columnContainer).find('.reminder-group').toggleClass('hidden', !reminderCheckbox.is(':checked')); });