From 68f0e814a7d3589c3d708339870f44cef83eb4a2 Mon Sep 17 00:00:00 2001
From: alexisben <alexiben7@gmail.com>
Date: Fri, 11 Mar 2022 17:02:39 +0100
Subject: [PATCH] Cleanup static
---
app/models/communication/block/partner.rb | 8 ++++++++
.../blocks/templates/partners/_static.html.erb | 16 +++-------------
2 files changed, 11 insertions(+), 13 deletions(-)
diff --git a/app/models/communication/block/partner.rb b/app/models/communication/block/partner.rb
index c54cfbe06..0f8afff5e 100644
--- a/app/models/communication/block/partner.rb
+++ b/app/models/communication/block/partner.rb
@@ -3,6 +3,14 @@ class Communication::Block::Partner < Communication::Block::Abstract
elements.each do |partner|
blob = find_blob partner, 'logo'
add_dependency blob unless blob.nil?
+
+ # TODO : add organization dependency
+ # id = partner['id']
+ # next if id.blank?
+ # organization = university.organizations.find id
+ # next if organization.nil?
+ # add_dependency organization
+ # add_dependency organization.active_storage_blobs
end
end
end
diff --git a/app/views/admin/communication/blocks/templates/partners/_static.html.erb b/app/views/admin/communication/blocks/templates/partners/_static.html.erb
index 373e914d5..3807e25ed 100644
--- a/app/views/admin/communication/blocks/templates/partners/_static.html.erb
+++ b/app/views/admin/communication/blocks/templates/partners/_static.html.erb
@@ -1,20 +1,10 @@
<% if block.data.has_key?('elements') %>
<% block.data['elements'].each do |partner|
id = partner['id']
- if id != ''
- unless id.nil?
- unless id.empty?
- organization = block.university.organizations.find id %>
+ unless id.blank?
+ organization = block.university.organizations.find id %>
- id: "<%= id %>"
- name: >
- <%= prepare_text_for_static organization.name %>
- url: <%= prepare_text_for_static organization.url %>
- <% if organization.logo.attached? %>
- logo: "<%= organization.logo.blob.id %>"
- <% end %>
- <% end
- end
- else %>
+ <% else %>
- name: >
<%= prepare_text_for_static partner['name'] %>
url: >-
--
GitLab