diff --git a/app/assets/javascripts/repositories/stock.js b/app/assets/javascripts/repositories/stock.js index 15f32b669..2ad82c8d5 100644 --- a/app/assets/javascripts/repositories/stock.js +++ b/app/assets/javascripts/repositories/stock.js @@ -120,7 +120,7 @@ var RepositoryStockValues = (function() { SmartAnnotation.init($('#repository-stock-value-comment')[0]); - $('#repository-stock-value-comment').on('keyup change', function() { + $('#repository-stock-value-comment').on('input', function() { $(this).closest('.sci-input-container').toggleClass( 'error', this.value.length > GLOBAL_CONSTANTS.NAME_MAX_LENGTH 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 bff2c46bc..a15b6f0b5 100644 --- a/app/assets/javascripts/repository_columns/columns_initializers/date_column.js +++ b/app/assets/javascripts/repository_columns/columns_initializers/date_column.js @@ -1,4 +1,4 @@ -/* global dropdownSelector */ +/* global GLOBAL_CONSTANTS dropdownSelector */ /* eslint-disable no-unused-vars */ var RepositoryDateColumnType = (function() { const columnContainer = '.date-column-type'; @@ -36,6 +36,16 @@ var RepositoryDateColumnType = (function() { $modal.on('columnModal::partialLoadedForRepositoryDateValue', function() { initReminderUnitDropdown(); + $('#date-reminder-message').on('input', function() { + $(this).closest('.sci-input-container').toggleClass( + 'error', + this.value.length > GLOBAL_CONSTANTS.NAME_MAX_LENGTH + ); + $('#update-repo-column-submit').toggleClass( + 'disabled', + this.value.length > GLOBAL_CONSTANTS.NAME_MAX_LENGTH + ); + }); }); } 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 a2a986a6b..758de8b1f 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 @@ -1,4 +1,4 @@ -/* global dropdownSelector */ +/* global GLOBAL_CONSTANTS dropdownSelector */ /* eslint-disable no-unused-vars */ var RepositoryDateTimeColumnType = (function() { const columnContainer = '.datetime-column-type'; @@ -36,6 +36,16 @@ var RepositoryDateTimeColumnType = (function() { $modal.on('columnModal::partialLoadedForRepositoryDateTimeValue', function() { initReminderUnitDropdown(); + $('#datetime-reminder-message').on('input', function() { + $(this).closest('.sci-input-container').toggleClass( + 'error', + this.value.length > GLOBAL_CONSTANTS.NAME_MAX_LENGTH + ); + $('#update-repo-column-submit').toggleClass( + 'disabled', + this.value.length > GLOBAL_CONSTANTS.NAME_MAX_LENGTH + ); + }); }); } diff --git a/app/views/repository_columns/manage_column_partials/_date.html.erb b/app/views/repository_columns/manage_column_partials/_date.html.erb index ff6f15330..9004620e2 100644 --- a/app/views/repository_columns/manage_column_partials/_date.html.erb +++ b/app/views/repository_columns/manage_column_partials/_date.html.erb @@ -54,10 +54,9 @@ <%= t('libraries.manange_modal_column.datetime_type.reminder_message') %>
-
- +
diff --git a/app/views/repository_columns/manage_column_partials/_datetime.html.erb b/app/views/repository_columns/manage_column_partials/_datetime.html.erb index 2b9131bb7..34494c6a7 100644 --- a/app/views/repository_columns/manage_column_partials/_datetime.html.erb +++ b/app/views/repository_columns/manage_column_partials/_datetime.html.erb @@ -54,10 +54,9 @@ <%= t('libraries.manange_modal_column.datetime_type.reminder_message') %>
-
- +
diff --git a/config/locales/en.yml b/config/locales/en.yml index 174a9569c..8970a4c69 100644 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -1810,6 +1810,7 @@ en: reminder_message: 'Message (optional)' enter_reminder_message: 'Enter a reminder message' range_label: 'Range' + reminder_message_limit: "Maximum number of characters reached (255)" stock_type: multiple_options: 'selected' all_options: 'All options'