mirror of
https://github.com/scinote-eln/scinote-web.git
synced 2025-10-09 13:28:53 +08:00
Merge pull request #7424 from G-Chubinidze/gc_SCI_10534
When exporting inventory items, do not convert smart annotation tags to text [SCI-10534]
This commit is contained in:
commit
f81d9185ca
2 changed files with 6 additions and 11 deletions
|
@ -59,14 +59,11 @@ module RepositoryCsvExport
|
||||||
else
|
else
|
||||||
cell = row.repository_cells.find_by(repository_column_id: c_id)
|
cell = row.repository_cells.find_by(repository_column_id: c_id)
|
||||||
|
|
||||||
csv_row << if cell
|
csv_row << if cell
|
||||||
if cell.value_type == 'RepositoryAssetValue' && handle_file_name_func
|
if cell.value_type == 'RepositoryAssetValue' && handle_file_name_func
|
||||||
handle_file_name_func.call(cell.value.asset)
|
handle_file_name_func.call(cell.value.asset)
|
||||||
else
|
else
|
||||||
SmartAnnotations::TagToText.new(
|
cell.value.export_formatted
|
||||||
user, repository.team, cell.value.export_formatted
|
|
||||||
).text
|
|
||||||
end
|
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
|
@ -64,9 +64,7 @@ module RepositoryXlsxExport
|
||||||
if cell.value_type == 'RepositoryAssetValue' && handle_file_name_func
|
if cell.value_type == 'RepositoryAssetValue' && handle_file_name_func
|
||||||
handle_file_name_func.call(cell.value.asset)
|
handle_file_name_func.call(cell.value.asset)
|
||||||
else
|
else
|
||||||
SmartAnnotations::TagToText.new(
|
cell.value.export_formatted
|
||||||
user, repository.team, cell.value.export_formatted
|
|
||||||
).text
|
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
Loading…
Add table
Reference in a new issue