scinote-eln/scinote-web
1
1
Fork 0
mirror of https://github.com/scinote-eln/scinote-web.git synced 2025-09-16 18:14:30 +08:00
Code Issues Projects Releases Packages Wiki Activity

Fix shared location duplication [SCI-11161]

Browse source
This commit is contained in:
Anton 2024-10-08 15:22:25 +02:00
parent 920505d59c
commit 8ccc805cd8
2 changed files with 7 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/controllers/storage_locations_controller.rb
View file

@ -86,7 +86,7 @@ class StorageLocationsController < ApplicationController
def duplicate
ActiveRecord::Base.transaction do
new_storage_location = @storage_location.duplicate!(current_user)
new_storage_location = @storage_location.duplicate!(current_user, current_team)
if new_storage_location
@storage_location = new_storage_location
log_activity('storage_location_created')

10
app/models/storage_location.rb
View file

@ -61,14 +61,15 @@ class StorageLocation < ApplicationRecord
storage_location_repository_rows.count.zero?
end
def duplicate!(user)
def duplicate!(user, team)
ActiveRecord::Base.transaction do
new_storage_location = dup
new_storage_location.name = next_clone_name
new_storage_location.team = team unless parent_id
new_storage_location.created_by = user
new_storage_location.save!
copy_image(self, new_storage_location)
recursive_duplicate(id, new_storage_location.id, user)
recursive_duplicate(id, new_storage_location.id, user, new_storage_location.team)
new_storage_location
rescue ActiveRecord::RecordInvalid
false
@ -144,14 +145,15 @@ class StorageLocation < ApplicationRecord
private
def recursive_duplicate(old_parent_id = nil, new_parent_id = nil, user = nil)
def recursive_duplicate(old_parent_id = nil, new_parent_id = nil, user = nil, team = nil)
StorageLocation.where(parent_id: old_parent_id).find_each do |child|
new_child = child.dup
new_child.parent_id = new_parent_id
new_child.team = team
new_child.created_by = user
new_child.save!
copy_image(child, new_child)
recursive_duplicate(child.id, new_child.id, user)
recursive_duplicate(child.id, new_child.id, user, team)
end
end