scinote-eln/scinote-web
1
1
Fork 0
mirror of https://github.com/scinote-eln/scinote-web.git synced 2025-10-06 20:05:55 +08:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #4075 from okriuchykhin/ok_SCI_6800

Browse source 
Allow deletion of stock columns when stock management is disabled [SCI-6800]
This commit is contained in:
Alex Kriuchykhin 2022-05-09 10:26:44 +02:00 • committed by GitHub
commit 297c58c0cd
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 7 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
app/permissions/repository_column.rb
View file

@ -7,10 +7,6 @@ Canaid::Permissions.register_for(RepositoryColumn) do
managable = repository_column.repository.repository_snapshots.provisioning.none? && managable = repository_column.repository.repository_snapshots.provisioning.none? &&
can_create_repository_columns?(user, repository_column.repository) can_create_repository_columns?(user, repository_column.repository)
if repository_column.data_type == 'RepositoryStockValue'
managable = can_manage_repository_stock?(user, repository_column.repository) && managable
end
managable managable
end end
end end

8
app/views/repository_columns/_manage_column_modal_content.html.erb
View file

@ -82,7 +82,7 @@
<option data-create-url="<%= repository_repository_columns_stock_columns_path(@repository) %>" <option data-create-url="<%= repository_repository_columns_stock_columns_path(@repository) %>"
data-edit-url="<%= repository_repository_columns_stock_column_path(@repository, @repository_column) unless @repository_column.new_record? %>" data-edit-url="<%= repository_repository_columns_stock_column_path(@repository, @repository_column) unless @repository_column.new_record? %>"
value="RepositoryStockValue" value="RepositoryStockValue"
<% if @repository.repository_columns.where(data_type: 'RepositoryStockValue').any? %> <% if @repository.repository_stock_column.present? %>
data-params="<%= { data-params="<%= {
optionClass: 'disabled-option', optionClass: 'disabled-option',
text_description: 'Only one per inventory allowed' text_description: 'Only one per inventory allowed'
@ -91,6 +91,12 @@
<%= 'selected' if @repository_column.repository_stock_value? %> > <%= 'selected' if @repository_column.repository_stock_value? %> >
<%= t('libraries.manange_modal_column.select.repository_stock_value') %> <%= t('libraries.manange_modal_column.select.repository_stock_value') %>
</option> </option>
<% elsif @repository_column.repository_stock_value? && @repository_column.persisted? %>
<option value="RepositoryTextValue" class="disabled-option"
data-params="<%= { optionClass: 'disabled-option' }.to_json %>"
selected>
<%= t('libraries.manange_modal_column.select.repository_stock_value') %>
</option>
<% end %> <% end %>
<option data-delimiter=true></option> <option data-delimiter=true></option>