From d49f6c8cd8b290413453b13553e6d99dde9680a7 Mon Sep 17 00:00:00 2001
From: alexisben <alexiben7@gmail.com>
Date: Mon, 21 Feb 2022 14:31:57 +0100
Subject: [PATCH] Test static data generated by blocks
---
app/models/administration/qualiopi/indicator.rb | 2 +-
app/models/communication/website.rb | 2 +-
app/models/communication/website/git_file.rb | 2 +-
app/models/communication/website/page.rb | 2 +-
app/models/education/program.rb | 2 +-
app/models/university/person.rb | 4 ++--
app/models/university/person/administrator.rb | 4 ++--
app/models/university/person/author.rb | 4 ++--
app/models/university/person/researcher.rb | 4 ++--
app/models/university/person/teacher.rb | 4 ++--
.../communication/website/blocks/edit.html.erb | 5 +++--
.../blocks/templates/partners/_edit.html.erb | 1 +
.../blocks/templates/partners/_static.html.erb | 17 +++++++++++++----
13 files changed, 32 insertions(+), 21 deletions(-)
diff --git a/app/models/administration/qualiopi/indicator.rb b/app/models/administration/qualiopi/indicator.rb
index c43737ece..8231f9cde 100644
--- a/app/models/administration/qualiopi/indicator.rb
+++ b/app/models/administration/qualiopi/indicator.rb
@@ -20,7 +20,7 @@
#
# Foreign Keys
#
-# fk_rails_eed87f7acf (criterion_id => administration_qualiopi_criterions.id)
+# fk_rails_31f1a0a2c9 (criterion_id => administration_qualiopi_criterions.id)
#
class Administration::Qualiopi::Indicator < ApplicationRecord
belongs_to :criterion
diff --git a/app/models/communication/website.rb b/app/models/communication/website.rb
index a5ff5c580..e61b8cb24 100644
--- a/app/models/communication/website.rb
+++ b/app/models/communication/website.rb
@@ -30,7 +30,7 @@
#
# Foreign Keys
#
-# fk_rails_bb6a496c08 (university_id => universities.id)
+# fk_rails_94b0abd85b (university_id => universities.id)
#
class Communication::Website < ApplicationRecord
include WithAbouts
diff --git a/app/models/communication/website/git_file.rb b/app/models/communication/website/git_file.rb
index 155b8cb07..4ade6aec3 100644
--- a/app/models/communication/website/git_file.rb
+++ b/app/models/communication/website/git_file.rb
@@ -19,7 +19,7 @@
#
# Foreign Keys
#
-# fk_rails_8505d649e8 (website_id => communication_websites.id)
+# fk_rails_b6b8b2cce2 (website_id => communication_websites.id)
#
class Communication::Website::GitFile < ApplicationRecord
belongs_to :website, class_name: 'Communication::Website'
diff --git a/app/models/communication/website/page.rb b/app/models/communication/website/page.rb
index fa9ffcd3b..c54c59b62 100644
--- a/app/models/communication/website/page.rb
+++ b/app/models/communication/website/page.rb
@@ -33,8 +33,8 @@
# Foreign Keys
#
# fk_rails_1a42003f06 (parent_id => communication_website_pages.id)
+# fk_rails_2315541232 (related_category_id => communication_website_categories.id)
# fk_rails_280107c62b (communication_website_id => communication_websites.id)
-# fk_rails_47b37cf8b2 (related_category_id => communication_website_categories.id)
# fk_rails_d208d15a73 (university_id => universities.id)
#
diff --git a/app/models/education/program.rb b/app/models/education/program.rb
index d2328f5b2..cec653a4a 100644
--- a/app/models/education/program.rb
+++ b/app/models/education/program.rb
@@ -39,7 +39,7 @@
#
# Foreign Keys
#
-# fk_rails_08b351087c (university_id => universities.id)
+# fk_rails_6e16107511 (university_id => universities.id)
# fk_rails_ec1f16f607 (parent_id => education_programs.id)
#
class Education::Program < ApplicationRecord
diff --git a/app/models/university/person.rb b/app/models/university/person.rb
index 49718973f..da61385fd 100644
--- a/app/models/university/person.rb
+++ b/app/models/university/person.rb
@@ -27,8 +27,8 @@
#
# Foreign Keys
#
-# fk_rails_b47a769440 (user_id => users.id)
-# fk_rails_da35e70d61 (university_id => universities.id)
+# fk_rails_433744b4e8 (user_id => users.id)
+# fk_rails_49ac392937 (university_id => universities.id)
#
class University::Person < ApplicationRecord
include WithGit
diff --git a/app/models/university/person/administrator.rb b/app/models/university/person/administrator.rb
index b7bca4442..d11f849b2 100644
--- a/app/models/university/person/administrator.rb
+++ b/app/models/university/person/administrator.rb
@@ -27,8 +27,8 @@
#
# Foreign Keys
#
-# fk_rails_b47a769440 (user_id => users.id)
-# fk_rails_da35e70d61 (university_id => universities.id)
+# fk_rails_433744b4e8 (user_id => users.id)
+# fk_rails_49ac392937 (university_id => universities.id)
#
class University::Person::Administrator < University::Person
def self.polymorphic_name
diff --git a/app/models/university/person/author.rb b/app/models/university/person/author.rb
index 5bf2ee2c4..5c5fb92cc 100644
--- a/app/models/university/person/author.rb
+++ b/app/models/university/person/author.rb
@@ -27,8 +27,8 @@
#
# Foreign Keys
#
-# fk_rails_b47a769440 (user_id => users.id)
-# fk_rails_da35e70d61 (university_id => universities.id)
+# fk_rails_433744b4e8 (user_id => users.id)
+# fk_rails_49ac392937 (university_id => universities.id)
#
class University::Person::Author < University::Person
def self.polymorphic_name
diff --git a/app/models/university/person/researcher.rb b/app/models/university/person/researcher.rb
index 9ca522425..989f141a5 100644
--- a/app/models/university/person/researcher.rb
+++ b/app/models/university/person/researcher.rb
@@ -27,8 +27,8 @@
#
# Foreign Keys
#
-# fk_rails_b47a769440 (user_id => users.id)
-# fk_rails_da35e70d61 (university_id => universities.id)
+# fk_rails_433744b4e8 (user_id => users.id)
+# fk_rails_49ac392937 (university_id => universities.id)
#
class University::Person::Researcher < University::Person
def self.polymorphic_name
diff --git a/app/models/university/person/teacher.rb b/app/models/university/person/teacher.rb
index 2f75bd1ab..e83a8b826 100644
--- a/app/models/university/person/teacher.rb
+++ b/app/models/university/person/teacher.rb
@@ -27,8 +27,8 @@
#
# Foreign Keys
#
-# fk_rails_b47a769440 (user_id => users.id)
-# fk_rails_da35e70d61 (university_id => universities.id)
+# fk_rails_433744b4e8 (user_id => users.id)
+# fk_rails_49ac392937 (university_id => universities.id)
#
class University::Person::Teacher < University::Person
def self.polymorphic_name
diff --git a/app/views/admin/communication/website/blocks/edit.html.erb b/app/views/admin/communication/website/blocks/edit.html.erb
index 014c01877..1b9e54904 100644
--- a/app/views/admin/communication/website/blocks/edit.html.erb
+++ b/app/views/admin/communication/website/blocks/edit.html.erb
@@ -48,7 +48,8 @@
console.log(error);
} else {
object[key] = {
- id: blob.signed_id,
+ id: blob.id,
+ signed_id: blob.signed_id,
filename: blob.filename
};
}
@@ -58,7 +59,7 @@
return this.directUpload.blobUrlTemplate.replace(':signed_id', signed_id).replace(':filename', filename);
},
getImageUrl(data) {
- return this.getFileUrl(data.id, data.filename);
+ return this.getFileUrl(data.signed_id, data.filename);
}
}
});
diff --git a/app/views/admin/communication/website/blocks/templates/partners/_edit.html.erb b/app/views/admin/communication/website/blocks/templates/partners/_edit.html.erb
index 941954b6f..4684bf18f 100644
--- a/app/views/admin/communication/website/blocks/templates/partners/_edit.html.erb
+++ b/app/views/admin/communication/website/blocks/templates/partners/_edit.html.erb
@@ -67,6 +67,7 @@
:id="'category-' + categoryIndex + '-partner-url-' + partnerIndex">
</div>
<div class="col-lg-4">
+ <%# TODO : create a uploader vue3 component %>
<label class="form-label"
:for="'category-' + categoryIndex + '-partner-logo-' + partnerIndex">
Logo
diff --git a/app/views/admin/communication/website/blocks/templates/partners/_static.html.erb b/app/views/admin/communication/website/blocks/templates/partners/_static.html.erb
index e1b020883..593e0f536 100644
--- a/app/views/admin/communication/website/blocks/templates/partners/_static.html.erb
+++ b/app/views/admin/communication/website/blocks/templates/partners/_static.html.erb
@@ -2,9 +2,18 @@
<% block.data['elements'].each do |element| %>
- name: >
<%= element['title'] %>
- url: <%= element['url'] %>
- <% if element['logo'] %>
- logo: <%= element['logo']['id'] %>
- <% end %>
+ partners:
+<%
+element['partners'].each do |partner|
+%>
+ - name: "<%= partner['name'] %>"
+ url: "<%= partner['url'] %>"
+ <% if partner.has_key?('logo') %>
+ <% if partner['logo'].has_key?('id') %>
+ logo: "<%= partner['logo']['id'] %>"
+ <% end %>
+ <% end %>
+<% end %>
+
<% end %>
<% end %>
--
GitLab