Merge pull request #2310 from biosistemika/SCI-4199-selected-checklist-is-lost

Sci 4199 selected checklist is lost
This commit is contained in:
Miha Mencin 2020-01-15 15:28:34 +01:00 committed by GitHub
commit b23c874f9e
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
7 changed files with 29 additions and 4 deletions

View file

@ -31,6 +31,7 @@ var RepositoryChecklistColumnType = (function() {
delimiterDropdown,
dropdownOptions
);
$('.changing-existing-list-items-warning').removeClass('hidden');
initChecklistDropdown();
})
.on('change', delimiterDropdown, function() {

View file

@ -110,6 +110,7 @@ var RepositoryListColumnType = (function() {
delimiterDropdown,
dropdownOptions
);
$('.changing-existing-list-items-warning').removeClass('hidden');
})
.on('change', delimiterDropdown, function() {
refreshPreviewDropdownList(

View file

@ -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(',')

View file

@ -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(',')

View file

@ -10,7 +10,7 @@
<%= t('libraries.manange_modal_column.list_type.delimiter_label') %>
</label>
<div class="col-sm-9">
<%= 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?) %>
</div>
</div>
<div class="form-group">
@ -19,6 +19,11 @@
</label>
<div class="col-sm-9">
<%= 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? %>
<div class="bg-danger hidden changing-existing-list-items-warning">
<%= t('libraries.manange_modal_column.change_multi_select_items_warning') %>
</div>
<% end %>
</div>
</div>
<div class="dropdown-preview">

View file

@ -10,7 +10,7 @@
<%= t('libraries.manange_modal_column.list_type.delimiter_label') %>
</label>
<div class="col-sm-9">
<%= 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?) %>
</div>
</div>
<div class="form-group">
@ -19,6 +19,11 @@
</label>
<div class="col-sm-9">
<%= 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? %>
<div class="bg-danger hidden changing-existing-list-items-warning">
<%= t('libraries.manange_modal_column.change_multi_select_items_warning') %>
</div>
<% end %>
</div>
</div>
<div class="dropdown-preview">

View file

@ -1156,6 +1156,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"