From 5bfa5c7939ea4d82a47c60b167d772361e57476a Mon Sep 17 00:00:00 2001 From: Miha Mencin Date: Wed, 15 Jan 2020 13:59:28 +0100 Subject: [PATCH 1/3] SCI-4199 disabling delimiter, adding warning --- .../checklist_column_type.js | 1 + .../columns_initializers/list_column_type.js | 1 + .../checklist_columns_controller.rb | 8 ++++++- .../list_columns_controller.rb | 8 ++++++- .../_checklist.html.erb | 7 ++++++- .../manage_column_partials/_list.html.erb | 21 ++++++++++++------- config/locales/en.yml | 1 + 7 files changed, 37 insertions(+), 10 deletions(-) diff --git a/app/assets/javascripts/repository_columns/columns_initializers/checklist_column_type.js b/app/assets/javascripts/repository_columns/columns_initializers/checklist_column_type.js index 24eef0884..646d5fc38 100644 --- a/app/assets/javascripts/repository_columns/columns_initializers/checklist_column_type.js +++ b/app/assets/javascripts/repository_columns/columns_initializers/checklist_column_type.js @@ -31,6 +31,7 @@ var RepositoryChecklistColumnType = (function() { delimiterDropdown, dropdownOptions ); + $('.changing-existing-list-items-warning').removeClass('hidden'); initChecklistDropdown(); }) .on('change', delimiterDropdown, function() { diff --git a/app/assets/javascripts/repository_columns/columns_initializers/list_column_type.js b/app/assets/javascripts/repository_columns/columns_initializers/list_column_type.js index 8aff9e318..4d1496fe5 100644 --- a/app/assets/javascripts/repository_columns/columns_initializers/list_column_type.js +++ b/app/assets/javascripts/repository_columns/columns_initializers/list_column_type.js @@ -110,6 +110,7 @@ var RepositoryListColumnType = (function() { delimiterDropdown, dropdownOptions ); + $('.changing-existing-list-items-warning').removeClass('hidden'); }) .on('change', delimiterDropdown, function() { refreshPreviewDropdownList( diff --git a/app/controllers/repository_columns/checklist_columns_controller.rb b/app/controllers/repository_columns/checklist_columns_controller.rb index c5e82cf62..c3adf3cd6 100644 --- a/app/controllers/repository_columns/checklist_columns_controller.rb +++ b/app/controllers/repository_columns/checklist_columns_controller.rb @@ -25,7 +25,7 @@ module RepositoryColumns .call(user: current_user, team: current_team, column: @repository_column, - params: repository_column_params) + params: repository_column_update_params) if service.succeed? render json: service.column, status: :ok, editing: true @@ -67,6 +67,12 @@ module RepositoryColumns .permit(:name, metadata: [:delimiter], repository_checklist_items_attributes: %i(data)) end + def repository_column_update_params + params + .require(:repository_column) + .permit(:name, repository_checklist_items_attributes: %i(data)) + end + def delimiters Constants::REPOSITORY_LIST_ITEMS_DELIMITERS .split(',') diff --git a/app/controllers/repository_columns/list_columns_controller.rb b/app/controllers/repository_columns/list_columns_controller.rb index 699d98952..88be0397e 100644 --- a/app/controllers/repository_columns/list_columns_controller.rb +++ b/app/controllers/repository_columns/list_columns_controller.rb @@ -25,7 +25,7 @@ module RepositoryColumns .call(user: current_user, team: current_team, column: @repository_column, - params: repository_column_params) + params: repository_column_update_params) if service.succeed? render json: service.column, status: :ok, editing: true @@ -67,6 +67,12 @@ module RepositoryColumns .permit(:name, metadata: [:delimiter], repository_list_items_attributes: %i(data)) end + def repository_column_update_params + params + .require(:repository_column) + .permit(:name, repository_list_items_attributes: %i(data)) + end + def delimiters Constants::REPOSITORY_LIST_ITEMS_DELIMITERS .split(',') diff --git a/app/views/repository_columns/manage_column_partials/_checklist.html.erb b/app/views/repository_columns/manage_column_partials/_checklist.html.erb index 10cf96183..483ec2e2c 100644 --- a/app/views/repository_columns/manage_column_partials/_checklist.html.erb +++ b/app/views/repository_columns/manage_column_partials/_checklist.html.erb @@ -10,7 +10,7 @@ <%= t('libraries.manange_modal_column.list_type.delimiter_label') %>
- <%= select_tag('delimiter', options_for_select(delimiters, selected_delimiter), class: 'form-control delimiter') %> + <%= select_tag('delimiter', options_for_select(delimiters, selected_delimiter), class: 'form-control delimiter',disabled: !column.new_record?) %>
@@ -19,6 +19,11 @@
<%= text_area_tag 'items-textarea', column.repository_checklist_items.pluck(:data).join(selected_delimiter_char), rows: 10, class: 'form-control items-textarea' %> + <% unless column.new_record? %> + + <% end %>
diff --git a/app/views/repository_columns/manage_column_partials/_list.html.erb b/app/views/repository_columns/manage_column_partials/_list.html.erb index 24c4eeeeb..7ac21a688 100644 --- a/app/views/repository_columns/manage_column_partials/_list.html.erb +++ b/app/views/repository_columns/manage_column_partials/_list.html.erb @@ -5,20 +5,27 @@ %> <%= hidden_field_tag 'dropdown-options', '[]', class: 'dropdown-options' %> -
- -
- <%= select_tag('delimiter', options_for_select(delimiters, selected_delimiter), class: 'form-control delimiter') %> + +
+ +
+ <%= select_tag('delimiter', options_for_select(delimiters, selected_delimiter), class: 'form-control delimiter', disabled: !column.new_record?) %> +
-
+
<%= text_area_tag 'items-textarea', column.repository_list_items.pluck(:data).join(selected_delimiter_char), rows: 10, class: 'form-control items-textarea' %> + <% unless column.new_record? %> + + <% end %>
diff --git a/config/locales/en.yml b/config/locales/en.yml index cf6ad6097..7c47a0a25 100644 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -1155,6 +1155,7 @@ en: name: "Name" colum_type: "Column type" dropdown_item_descirption: "Dropdown items should be separated by comma." + change_multi_select_items_warning: "Be careful: changing existing list items will result in deselecting previously selected items." select: repository_text_value: "Text" repository_number_value: "Number" From 8c7705817906005dfcc766a9e27b32d17c86ffd4 Mon Sep 17 00:00:00 2001 From: Miha Mencin Date: Wed, 15 Jan 2020 14:02:33 +0100 Subject: [PATCH 2/3] fixing indentation --- .../manage_column_partials/_list.html.erb | 16 +++++++--------- 1 file changed, 7 insertions(+), 9 deletions(-) diff --git a/app/views/repository_columns/manage_column_partials/_list.html.erb b/app/views/repository_columns/manage_column_partials/_list.html.erb index 7ac21a688..6423235d9 100644 --- a/app/views/repository_columns/manage_column_partials/_list.html.erb +++ b/app/views/repository_columns/manage_column_partials/_list.html.erb @@ -5,16 +5,14 @@ %> <%= hidden_field_tag 'dropdown-options', '[]', class: 'dropdown-options' %> - -
- -
- <%= select_tag('delimiter', options_for_select(delimiters, selected_delimiter), class: 'form-control delimiter', disabled: !column.new_record?) %> -
+
+ +
+ <%= select_tag('delimiter', options_for_select(delimiters, selected_delimiter), class: 'form-control delimiter', disabled: !column.new_record?) %>
- +
- <%= select_tag('delimiter', options_for_select(delimiters, selected_delimiter), class: 'form-control delimiter',disabled: !column.new_record?) %> + <%= select_tag('delimiter', options_for_select(delimiters, selected_delimiter), class: 'form-control delimiter', disabled: !column.new_record?) %>