From 0c4129ab336f017d640e2d60b87ac5aaca448225 Mon Sep 17 00:00:00 2001 From: Arnaud Levy <contact@arnaudlevy.com> Date: Sun, 27 Feb 2022 19:01:16 +0100 Subject: [PATCH] fix dependencies --- .../communication/block/organization_chart.rb | 16 +++++++--------- app/models/communication/block/partner.rb | 14 ++++++-------- 2 files changed, 13 insertions(+), 17 deletions(-) diff --git a/app/models/communication/block/organization_chart.rb b/app/models/communication/block/organization_chart.rb index 844dbdaac..86e80ab7a 100644 --- a/app/models/communication/block/organization_chart.rb +++ b/app/models/communication/block/organization_chart.rb @@ -1,15 +1,13 @@ class Communication::Block::OrganizationChart < Communication::Block::Template def git_dependencies dependencies = [] - data['elements'].each do |element| - element['persons'].each do |person| - id = person['id'] - next if id.blank? - person = university.people.find id - next if person.nil? - dependencies += [person] - dependencies += person.active_storage_blobs - end + data['elements'].each do |person| + id = person['id'] + next if id.blank? + person = university.people.find id + next if person.nil? + dependencies += [person] + dependencies += person.active_storage_blobs end dependencies.uniq end diff --git a/app/models/communication/block/partner.rb b/app/models/communication/block/partner.rb index cfe271b8a..f599239e5 100644 --- a/app/models/communication/block/partner.rb +++ b/app/models/communication/block/partner.rb @@ -1,14 +1,12 @@ class Communication::Block::Partner < Communication::Block::Template def git_dependencies dependencies = [] - data['elements'].each do |element| - element['partners'].each do |partner| - id = partner.dig('logo', 'id') - next if id.blank? - blob = university.active_storage_blobs.find id - next if blob.nil? - dependencies += [blob] - end + data['elements'].each do |partner| + id = partner.dig('logo', 'id') + next if id.blank? + blob = university.active_storage_blobs.find id + next if blob.nil? + dependencies += [blob] end dependencies.uniq end -- GitLab