scinote-eln/scinote-web
1
1
Fork 0
mirror of https://github.com/scinote-eln/scinote-web.git synced 2025-12-09 21:56:32 +08:00
Code Issues Projects Releases Packages Wiki Activity

Remove obsolete logic from location importer [SCI-11050]

Browse source
This commit is contained in:
Martin Artnik 2024-09-13 15:34:46 +02:00
parent d6ca444f4a
commit ddc7cf9bf6
2 changed files with 5 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/controllers/storage_locations_controller.rb
View file

@ -133,7 +133,7 @@ class StorageLocationsController < ApplicationController
def import_container def import_container
result = StorageLocations::ImportService.new(@storage_location, params[:file], current_user).import_items result = StorageLocations::ImportService.new(@storage_location, params[:file], current_user).import_items
if result[:status] == :ok if result[:status] == :ok
if (result[:assigned_count] + result[:unassigned_count] + result[:updated_count]).positive? if (result[:assigned_count] + result[:unassigned_count]).positive?
log_activity( log_activity(
:storage_location_imported, :storage_location_imported,
{ {

11
app/services/storage_locations/import_service.rb
View file

@ -8,7 +8,6 @@ module StorageLocations
@storage_location = storage_location @storage_location = storage_location
@assigned_count = 0 @assigned_count = 0
@unassigned_count = 0 @unassigned_count = 0
@updated_count = 0
@sheet = SpreadsheetParser.open_spreadsheet(file) @sheet = SpreadsheetParser.open_spreadsheet(file)
@user = user @user = user
end end
@ -73,12 +72,10 @@ module StorageLocations
metadata: { position: row[:position] } metadata: { position: row[:position] }
) )
@assigned_count += 1 if storage_location_repository_row.new_record? if storage_location_repository_row.new_record?
@assigned_count += 1
storage_location_repository_row.update!( storage_location_repository_row.update!(created_by: @user)
repository_row_id: row[:repository_row_id], end
created_by: storage_location_repository_row.created_by || @user
)
end end
def unassign_repository_rows! def unassign_repository_rows!