scinote-eln/scinote-web
1
1
Fork 0
mirror of https://github.com/scinote-eln/scinote-web.git synced 2024-09-20 14:45:56 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fix empty file name on protocols.io

Browse source 
Closes SCI-3650
This commit is contained in:
Jure Grabnar 2019-07-03 16:11:51 +02:00
parent e965866d57
commit 8866d98512
4 changed files with 21 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
app/utilities/protocol_importers/protocols_io/v3/step_components.rb
View file

@ -51,9 +51,12 @@ module ProtocolImporters
def self.attachments(components)
components.select { |c| c[:type_id] == 23 }.map do |cc|
# Original name can be empty, so just use source
name = cc[:source][:original_name] || cc[:source][:source].split('/')[-1]
{
url: cc[:source][:source],
name: cc[:source][:name]
name: name
}
end
end

4
spec/fixtures/files/protocol_importers/normalized_single_protocol.json vendored
View file

@ -110,6 +110,10 @@
{
"url": "http://something.com/wp-content/uploads/2014/11/14506718045_5b3e71dacd_o.jpg",
"name": "Second file"
},
{
"url": "http://something.com/wp-content/uploads/2014/11/14506718045_5b3e71dacd_o.jpg",
"name": "14506718045_5b3e71dacd_o.jpg"
}
],
"position": 0

14
spec/fixtures/files/protocol_importers/protocols_io/v3/single_protocol.json vendored
View file

@ -579,7 +579,7 @@
"type_id": 23,
"title": "file",
"source": {
"name": "First file",
"original_name": "First file",
"source": "https://pbs.twimg.com/media/Cwu3zrZWQAA7axs.jpg"
}
},
@ -590,7 +590,17 @@
"type_id": 23,
"title": "file",
"source": {
"name": "Second file",
"original_name": "Second file",
"source": "http://something.com/wp-content/uploads/2014/11/14506718045_5b3e71dacd_o.jpg"
}
},
{
"id": 1054723,
"guid": "A85D4EBC0F394B38A4C8D65D5CB6877F",
"order_id": 4,
"type_id": 23,
"title": "file",
"source": {
"source": "http://something.com/wp-content/uploads/2014/11/14506718045_5b3e71dacd_o.jpg"
}
}

2
spec/utilities/protocol_importers/protocol_intermediate_object_spec.rb
View file

@ -29,7 +29,7 @@ describe ProtocolImporters::ProtocolIntermediateObject do
context 'when have valid object' do
it { expect { pio.import }.to change { Protocol.all.count }.by(1) }
it { expect { pio.import }.to change { Step.all.count }.by(2) }
it { expect { pio.import }.to change { Asset.all.count }.by(2) }
it { expect { pio.import }.to change { Asset.all.count }.by(3) }
it { expect(pio.import).to be_valid }
end