mirror of
https://github.com/scinote-eln/scinote-web.git
synced 2025-03-05 12:13:09 +08:00
Merge pull request #2310 from biosistemika/SCI-4199-selected-checklist-is-lost
Sci 4199 selected checklist is lost
This commit is contained in:
commit
b23c874f9e
7 changed files with 29 additions and 4 deletions
app
assets/javascripts/repository_columns/columns_initializers
controllers/repository_columns
views/repository_columns/manage_column_partials
config/locales
|
@ -31,6 +31,7 @@ var RepositoryChecklistColumnType = (function() {
|
||||||
delimiterDropdown,
|
delimiterDropdown,
|
||||||
dropdownOptions
|
dropdownOptions
|
||||||
);
|
);
|
||||||
|
$('.changing-existing-list-items-warning').removeClass('hidden');
|
||||||
initChecklistDropdown();
|
initChecklistDropdown();
|
||||||
})
|
})
|
||||||
.on('change', delimiterDropdown, function() {
|
.on('change', delimiterDropdown, function() {
|
||||||
|
|
|
@ -110,6 +110,7 @@ var RepositoryListColumnType = (function() {
|
||||||
delimiterDropdown,
|
delimiterDropdown,
|
||||||
dropdownOptions
|
dropdownOptions
|
||||||
);
|
);
|
||||||
|
$('.changing-existing-list-items-warning').removeClass('hidden');
|
||||||
})
|
})
|
||||||
.on('change', delimiterDropdown, function() {
|
.on('change', delimiterDropdown, function() {
|
||||||
refreshPreviewDropdownList(
|
refreshPreviewDropdownList(
|
||||||
|
|
|
@ -25,7 +25,7 @@ module RepositoryColumns
|
||||||
.call(user: current_user,
|
.call(user: current_user,
|
||||||
team: current_team,
|
team: current_team,
|
||||||
column: @repository_column,
|
column: @repository_column,
|
||||||
params: repository_column_params)
|
params: repository_column_update_params)
|
||||||
|
|
||||||
if service.succeed?
|
if service.succeed?
|
||||||
render json: service.column, status: :ok, editing: true
|
render json: service.column, status: :ok, editing: true
|
||||||
|
@ -67,6 +67,12 @@ module RepositoryColumns
|
||||||
.permit(:name, metadata: [:delimiter], repository_checklist_items_attributes: %i(data))
|
.permit(:name, metadata: [:delimiter], repository_checklist_items_attributes: %i(data))
|
||||||
end
|
end
|
||||||
|
|
||||||
|
def repository_column_update_params
|
||||||
|
params
|
||||||
|
.require(:repository_column)
|
||||||
|
.permit(:name, repository_checklist_items_attributes: %i(data))
|
||||||
|
end
|
||||||
|
|
||||||
def delimiters
|
def delimiters
|
||||||
Constants::REPOSITORY_LIST_ITEMS_DELIMITERS
|
Constants::REPOSITORY_LIST_ITEMS_DELIMITERS
|
||||||
.split(',')
|
.split(',')
|
||||||
|
|
|
@ -25,7 +25,7 @@ module RepositoryColumns
|
||||||
.call(user: current_user,
|
.call(user: current_user,
|
||||||
team: current_team,
|
team: current_team,
|
||||||
column: @repository_column,
|
column: @repository_column,
|
||||||
params: repository_column_params)
|
params: repository_column_update_params)
|
||||||
|
|
||||||
if service.succeed?
|
if service.succeed?
|
||||||
render json: service.column, status: :ok, editing: true
|
render json: service.column, status: :ok, editing: true
|
||||||
|
@ -67,6 +67,12 @@ module RepositoryColumns
|
||||||
.permit(:name, metadata: [:delimiter], repository_list_items_attributes: %i(data))
|
.permit(:name, metadata: [:delimiter], repository_list_items_attributes: %i(data))
|
||||||
end
|
end
|
||||||
|
|
||||||
|
def repository_column_update_params
|
||||||
|
params
|
||||||
|
.require(:repository_column)
|
||||||
|
.permit(:name, repository_list_items_attributes: %i(data))
|
||||||
|
end
|
||||||
|
|
||||||
def delimiters
|
def delimiters
|
||||||
Constants::REPOSITORY_LIST_ITEMS_DELIMITERS
|
Constants::REPOSITORY_LIST_ITEMS_DELIMITERS
|
||||||
.split(',')
|
.split(',')
|
||||||
|
|
|
@ -10,7 +10,7 @@
|
||||||
<%= t('libraries.manange_modal_column.list_type.delimiter_label') %>
|
<%= t('libraries.manange_modal_column.list_type.delimiter_label') %>
|
||||||
</label>
|
</label>
|
||||||
<div class="col-sm-9">
|
<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>
|
</div>
|
||||||
<div class="form-group">
|
<div class="form-group">
|
||||||
|
@ -19,6 +19,11 @@
|
||||||
</label>
|
</label>
|
||||||
<div class="col-sm-9">
|
<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' %>
|
<%= 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>
|
</div>
|
||||||
<div class="dropdown-preview">
|
<div class="dropdown-preview">
|
||||||
|
|
|
@ -10,7 +10,7 @@
|
||||||
<%= t('libraries.manange_modal_column.list_type.delimiter_label') %>
|
<%= t('libraries.manange_modal_column.list_type.delimiter_label') %>
|
||||||
</label>
|
</label>
|
||||||
<div class="col-sm-9">
|
<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>
|
</div>
|
||||||
<div class="form-group">
|
<div class="form-group">
|
||||||
|
@ -19,6 +19,11 @@
|
||||||
</label>
|
</label>
|
||||||
<div class="col-sm-9">
|
<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' %>
|
<%= 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>
|
</div>
|
||||||
<div class="dropdown-preview">
|
<div class="dropdown-preview">
|
||||||
|
|
|
@ -1156,6 +1156,7 @@ en:
|
||||||
name: "Name"
|
name: "Name"
|
||||||
colum_type: "Column type"
|
colum_type: "Column type"
|
||||||
dropdown_item_descirption: "Dropdown items should be separated by comma."
|
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:
|
select:
|
||||||
repository_text_value: "Text"
|
repository_text_value: "Text"
|
||||||
repository_number_value: "Number"
|
repository_number_value: "Number"
|
||||||
|
|
Loading…
Reference in a new issue