From 2ffb4acb2f0ec8fa4d800d35d9adb8cd71209f0b Mon Sep 17 00:00:00 2001
From: Oleksii Kriuchykhin <okriuchykhin@biosistemika.com>
Date: Thu, 5 May 2022 15:44:21 +0200
Subject: [PATCH] Allow deleteion of stock columns when stock management is
 disabled [SCI-6800]

---
 app/permissions/repository_column.rb                      | 4 ----
 .../_manage_column_modal_content.html.erb                 | 8 +++++++-
 2 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/app/permissions/repository_column.rb b/app/permissions/repository_column.rb
index 631e2ff15..53c10974d 100644
--- a/app/permissions/repository_column.rb
+++ b/app/permissions/repository_column.rb
@@ -7,10 +7,6 @@ Canaid::Permissions.register_for(RepositoryColumn) do
     managable = repository_column.repository.repository_snapshots.provisioning.none? &&
       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
   end
 end
diff --git a/app/views/repository_columns/_manage_column_modal_content.html.erb b/app/views/repository_columns/_manage_column_modal_content.html.erb
index a461e7dd5..be9cd0d68 100644
--- a/app/views/repository_columns/_manage_column_modal_content.html.erb
+++ b/app/views/repository_columns/_manage_column_modal_content.html.erb
@@ -82,7 +82,7 @@
             <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? %>"
                     value="RepositoryStockValue"
-                    <% if @repository.repository_columns.where(data_type: 'RepositoryStockValue').any? %>
+                    <% if @repository.repository_stock_column.present? %>
                       data-params="<%= {
                         optionClass: 'disabled-option',
                         text_description: 'Only one per inventory allowed'
@@ -91,6 +91,12 @@
                     <%= 'selected' if @repository_column.repository_stock_value? %> >
               <%= t('libraries.manange_modal_column.select.repository_stock_value') %>
             </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 %>
           <option data-delimiter=true></option>