From 4381fbbe7f106e1c877a39cde2eaf7c703dd1f36 Mon Sep 17 00:00:00 2001
From: alexisben <alexiben7@gmail.com>
Date: Fri, 11 Mar 2022 14:36:35 +0100
Subject: [PATCH] Fix static data and backward compatibility
---
.../blocks/templates/partners/_edit.html.erb | 4 +--
.../templates/partners/_static.html.erb | 25 +++++++++----------
2 files changed, 14 insertions(+), 15 deletions(-)
diff --git a/app/views/admin/communication/blocks/templates/partners/_edit.html.erb b/app/views/admin/communication/blocks/templates/partners/_edit.html.erb
index 24734d09e..476799fa0 100644
--- a/app/views/admin/communication/blocks/templates/partners/_edit.html.erb
+++ b/app/views/admin/communication/blocks/templates/partners/_edit.html.erb
@@ -1,5 +1,5 @@
<a class="<%= button_classes('mb-4 me-1') %>"
- v-on:click="data.elements.push({name: '', url: '', logo: {}})">
+ v-on:click="data.elements.push({id:'', name: '', url: '', logo: {}})">
<%= t '.add_partner' %>
</a>
<draggable :list="data.elements" class="list-group" handle=".partnerHandle">
@@ -16,7 +16,7 @@
<select :id="'organization-' + index + '-id'"
class="form-select select"
v-model="partner.id">
- <option value="" :selected="!partner.id"><%= t '.unregistered_organization' %></option>
+ <option value="" :selected="true"><%= t '.unregistered_organization' %></option>
<% current_university.organizations.ordered.each_with_index do |organization, index| %>
<option value="<%= organization.id %>"><%= organization.name %></option>
<% 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 38daaa3fb..373e914d5 100644
--- a/app/views/admin/communication/blocks/templates/partners/_static.html.erb
+++ b/app/views/admin/communication/blocks/templates/partners/_static.html.erb
@@ -1,21 +1,20 @@
<% if block.data.has_key?('elements') %>
-<% block.data['elements'].each do |partner| %>
- <% if partner['type'] == 'organization' %>
- <% organization = block.university.organizations.find partner['id'] %>
- <% if organization %>
- - is_organization: true
- id: <%= partner['id'] %>
+<% block.data['elements'].each do |partner|
+ id = partner['id']
+ if id != ''
+ unless id.nil?
+ unless id.empty?
+ organization = block.university.organizations.find id %>
+ - id: "<%= id %>"
name: >
<%= prepare_text_for_static organization.name %>
- <% if organization.url %>
- url: >-
- <%= prepare_text_for_static organization.url %>
- <% end %>
+ url: <%= prepare_text_for_static organization.url %>
<% if organization.logo.attached? %>
logo: "<%= organization.logo.blob.id %>"
<% end %>
- <% end %>
- <% else %>
+ <% end
+ end
+ else %>
- name: >
<%= prepare_text_for_static partner['name'] %>
url: >-
@@ -23,4 +22,4 @@
logo: "<%= prepare_media_for_static partner, 'logo' %>"
<% end %>
<% end %>
-<% end %>
+<% end %>
\ No newline at end of file
--
GitLab