mirror of
https://github.com/scinote-eln/scinote-web.git
synced 2024-09-21 07:26:15 +08:00
SCI-4199 disabling delimiter, adding warning
This commit is contained in:
parent
271d6db792
commit
5bfa5c7939
|
@ -31,6 +31,7 @@ var RepositoryChecklistColumnType = (function() {
|
|||
delimiterDropdown,
|
||||
dropdownOptions
|
||||
);
|
||||
$('.changing-existing-list-items-warning').removeClass('hidden');
|
||||
initChecklistDropdown();
|
||||
})
|
||||
.on('change', delimiterDropdown, function() {
|
||||
|
|
|
@ -110,6 +110,7 @@ var RepositoryListColumnType = (function() {
|
|||
delimiterDropdown,
|
||||
dropdownOptions
|
||||
);
|
||||
$('.changing-existing-list-items-warning').removeClass('hidden');
|
||||
})
|
||||
.on('change', delimiterDropdown, function() {
|
||||
refreshPreviewDropdownList(
|
||||
|
|
|
@ -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(',')
|
||||
|
|
|
@ -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(',')
|
||||
|
|
|
@ -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">
|
||||
|
|
|
@ -5,20 +5,27 @@
|
|||
%>
|
||||
|
||||
<%= hidden_field_tag 'dropdown-options', '[]', class: 'dropdown-options' %>
|
||||
<div class="form-group">
|
||||
<label class="control-label col-sm-3" for="repository-column-data-type">
|
||||
<%= 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') %>
|
||||
|
||||
<div class="form-group">
|
||||
<label class="control-label col-sm-3" for="repository-column-data-type">
|
||||
<%= 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', disabled: !column.new_record?) %>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="form-group">
|
||||
<label class="control-label col-sm-3" for="repository-column-data-type">
|
||||
<%= t('libraries.manange_modal_column.list_type.dropdown_items_label') %>
|
||||
</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">
|
||||
|
|
|
@ -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"
|
||||
|
|
Loading…
Reference in a new issue