From 121a30ede60f1affaa96ebd72d9de7dfcf142655 Mon Sep 17 00:00:00 2001
From: Andrej <andrej.jugovic7@gmail.com>
Date: Tue, 30 Jul 2024 17:36:45 +0200
Subject: [PATCH 1/2] Remove add columns to the repository column management
 [SCI-10930]

---
 .../repository_columns/_manage_column_modal_index.html.erb      | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/views/repository_columns/_manage_column_modal_index.html.erb b/app/views/repository_columns/_manage_column_modal_index.html.erb
index dc58c813d..a4d8e4131 100644
--- a/app/views/repository_columns/_manage_column_modal_index.html.erb
+++ b/app/views/repository_columns/_manage_column_modal_index.html.erb
@@ -12,7 +12,7 @@
 </div>
 
 <div class="modal-footer">
-  <% if can_create_repository_columns?(@repository)%>
+  <% if can_create_repository_columns?(@repository) && !@repository.is_a?(SoftLockedRepository) %>
     <button id="new-repo-column-modal"
             data-view-mode="active"
             class="btn btn-secondary manage-repo-column"

From 70a03db57a2e971f18915253c4aa27b1bc654cf3 Mon Sep 17 00:00:00 2001
From: Martin Artnik <martin@scinote.net>
Date: Tue, 23 Jul 2024 10:30:07 +0200
Subject: [PATCH 2/2] Fix creating RepositoryStockConsumptionValues in
 repository snapshots [SCI-10908]

---
 app/models/repository_cell.rb | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/app/models/repository_cell.rb b/app/models/repository_cell.rb
index 443d64089..ef6990036 100644
--- a/app/models/repository_cell.rb
+++ b/app/models/repository_cell.rb
@@ -52,7 +52,16 @@ class RepositoryCell < ApplicationRecord
   }
 
   def update_repository_row_last_modified_by
-    repository_row.update!(last_modified_by_id: value.last_modified_by_id)
+    # RepositoryStockConsumptionValue currently don't store last_modified_by
+    # so this would fail. Should probably be refactored to unify the behaviour (23.7.2024)
+    if value.last_modified_by_id
+      repository_row.update!(last_modified_by_id: value.last_modified_by_id)
+    else
+      Rails.logger.warn(
+        "Missing last_modified_by_id for #{value.class} with id #{value.id}, " \
+        "skipping update of last_modified_by on RepositoryRow with id #{repository_row_id}."
+      )
+    end
   end
 
   def self.create_with_value!(row, column, data, user)