From c3bae4037ff9724a4fe47a99b5e38ed4b49f6e16 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?S=C3=A9bastien=20Gaya?= <sebastien.gaya@gmail.com>
Date: Thu, 9 Mar 2023 17:14:06 +0100
Subject: [PATCH] fix preview: empty -> blank
---
app/controllers/admin/users_controller.rb | 2 +-
app/controllers/extranet/account_controller.rb | 2 +-
app/controllers/users/registrations_controller.rb | 2 +-
app/models/communication/extranet/with_sso.rb | 2 +-
app/models/university/with_sso.rb | 2 +-
.../templates/call_to_action/_preview.html.erb | 6 +++---
.../blocks/templates/chapter/_preview.html.erb | 10 +++++-----
.../blocks/templates/contact/_preview.html.erb | 12 ++++++------
.../blocks/templates/datatable/_preview.html.erb | 12 ++++++------
.../blocks/templates/definitions/_preview.html.erb | 10 +++++-----
.../blocks/templates/files/_preview.html.erb | 12 ++++++------
.../blocks/templates/gallery/_preview.html.erb | 14 +++++++-------
.../blocks/templates/image/_preview.html.erb | 6 +++---
.../blocks/templates/key_figures/_preview.html.erb | 10 +++++-----
.../templates/testimonials/_preview.html.erb | 6 +++---
.../blocks/templates/timeline/_preview.html.erb | 8 ++++----
.../blocks/templates/video/_preview.html.erb | 4 ++--
.../admin/research/laboratories/axes/show.html.erb | 2 +-
18 files changed, 61 insertions(+), 61 deletions(-)
diff --git a/app/controllers/admin/users_controller.rb b/app/controllers/admin/users_controller.rb
index de2646347..21384cb34 100644
--- a/app/controllers/admin/users_controller.rb
+++ b/app/controllers/admin/users_controller.rb
@@ -88,7 +88,7 @@ class Admin::UsersController < Admin::ApplicationController
# Password not provided when user from sso
params[:user][:password] ||= ''
- if params[:user][:password].empty?
+ if params[:user][:password].blank?
params[:user].delete(:password)
else
@user.reset_password(params[:user][:password], params[:user][:password])
diff --git a/app/controllers/extranet/account_controller.rb b/app/controllers/extranet/account_controller.rb
index 47ded2d77..ace02aa0c 100644
--- a/app/controllers/extranet/account_controller.rb
+++ b/app/controllers/extranet/account_controller.rb
@@ -23,7 +23,7 @@ class Extranet::AccountController < Extranet::ApplicationController
# Password not provided when user from sso
params[:user][:password] ||= ''
- if params[:user][:password].empty?
+ if params[:user][:password].blank?
params[:user].delete(:password)
else
current_user.reset_password(params[:user][:password], params[:user][:password])
diff --git a/app/controllers/users/registrations_controller.rb b/app/controllers/users/registrations_controller.rb
index 14602622f..8cfedc522 100644
--- a/app/controllers/users/registrations_controller.rb
+++ b/app/controllers/users/registrations_controller.rb
@@ -21,7 +21,7 @@ class Users::RegistrationsController < Devise::RegistrationsController
# Password not provided when user from sso
params[:user][:password] ||= ''
- if params[:user][:password].empty?
+ if params[:user][:password].blank?
params[:user].delete(:password)
else
resource.reset_password(params[:user][:password], params[:user][:password])
diff --git a/app/models/communication/extranet/with_sso.rb b/app/models/communication/extranet/with_sso.rb
index 223eae3bd..99504282f 100644
--- a/app/models/communication/extranet/with_sso.rb
+++ b/app/models/communication/extranet/with_sso.rb
@@ -10,7 +10,7 @@ module Communication::Extranet::WithSso
# Setter to serialize data as JSON
def sso_mapping=(value)
- if value.empty?
+ if value.blank?
value = nil
else
value = JSON.parse value if value.is_a? String
diff --git a/app/models/university/with_sso.rb b/app/models/university/with_sso.rb
index 1bf5febd1..d54338223 100644
--- a/app/models/university/with_sso.rb
+++ b/app/models/university/with_sso.rb
@@ -10,7 +10,7 @@ module University::WithSso
# Setter to serialize data as JSON
def sso_mapping=(value)
- if value.empty?
+ if value.blank?
value = nil
else
value = JSON.parse value if value.is_a? String
diff --git a/app/views/admin/communication/blocks/templates/call_to_action/_preview.html.erb b/app/views/admin/communication/blocks/templates/call_to_action/_preview.html.erb
index 6a03d093e..ae6f329af 100644
--- a/app/views/admin/communication/blocks/templates/call_to_action/_preview.html.erb
+++ b/app/views/admin/communication/blocks/templates/call_to_action/_preview.html.erb
@@ -1,6 +1,6 @@
<%
-$class = "block block-call_to_action"
-unless @block.title.empty?
+$class = "block block-call_to_action"
+unless @block.title.blank?
$class += " block-with-title"
end
@@ -13,7 +13,7 @@ $image_class = "call_to_action--with" + (@block.template.image.empty? ? "out" :
<div class="block-content">
<div class="call_to_action <%= $image_class %>">
<div>
- <% unless @block.title.empty? %>
+ <% unless @block.title.blank? %>
<h2><%= @block.title %></h2>
<% end %>
<% if @block.template.text %>
diff --git a/app/views/admin/communication/blocks/templates/chapter/_preview.html.erb b/app/views/admin/communication/blocks/templates/chapter/_preview.html.erb
index f36ccec40..1be71e833 100644
--- a/app/views/admin/communication/blocks/templates/chapter/_preview.html.erb
+++ b/app/views/admin/communication/blocks/templates/chapter/_preview.html.erb
@@ -1,7 +1,7 @@
<%
-$class = "block block-chapter"
+$class = "block block-chapter"
-unless @block.title.empty?
+unless @block.title.blank?
$class += " block-with-title"
end
@@ -18,17 +18,17 @@ $class += " block-chapter--" + @block.template.layout
<div class="block-content">
<div class="chapter">
<div class="text">
- <% unless @block.title.empty? %>
+ <% unless @block.title.blank? %>
<div class="top">
<h2><%= @block.title %></h2>
</div>
<% end %>
- <% unless @block.template.text.empty? %>
+ <% unless @block.template.text.blank? %>
<div class="rich-text">
<%= block_component_preview :text %>
</div>
<% end %>
- <% unless @block.template.notes.empty? %>
+ <% unless @block.template.notes.blank? %>
<div class="notes">
<%= block_component_preview :notes %>
</div>
diff --git a/app/views/admin/communication/blocks/templates/contact/_preview.html.erb b/app/views/admin/communication/blocks/templates/contact/_preview.html.erb
index 3ffb5a299..9a617582b 100644
--- a/app/views/admin/communication/blocks/templates/contact/_preview.html.erb
+++ b/app/views/admin/communication/blocks/templates/contact/_preview.html.erb
@@ -1,6 +1,6 @@
<%
-$class = "block block-contact"
-unless @block.title.empty?
+$class = "block block-contact"
+unless @block.title.blank?
$class += " block-with-title"
end
%>
@@ -8,12 +8,12 @@ end
<section class="<%= $class %>">
<div class="container">
<div class="block-content">
- <% unless @block.title.empty? && @block.template.description.empty? %>
+ <% unless @block.title.blank? && @block.template.description.blank? %>
<div class="top">
- <% unless @block.title.empty? %>
+ <% unless @block.title.blank? %>
<h2><%= @block.title %></h2>
<% end %>
- <% unless @block.template.description.empty? %>
+ <% unless @block.template.description.blank? %>
<div class="description">
<p><%= block_component_preview :description %></p>
</div>
@@ -23,7 +23,7 @@ end
<div class="informations">
<address itemscope itemtype="https://schema.org/Organization">
- <% unless @block.template.name.empty? %>
+ <% unless @block.template.name.blank? %>
<p><%= block_component_preview :name %></p>
<% end %>
<div itemprop="address" itemscope itemtype="https://schema.org/PostalAddress">
diff --git a/app/views/admin/communication/blocks/templates/datatable/_preview.html.erb b/app/views/admin/communication/blocks/templates/datatable/_preview.html.erb
index 4f28c5ab2..fdd161bde 100644
--- a/app/views/admin/communication/blocks/templates/datatable/_preview.html.erb
+++ b/app/views/admin/communication/blocks/templates/datatable/_preview.html.erb
@@ -1,18 +1,18 @@
<%
-$class = "block block-datatable"
-unless @block.title.empty?
+$class = "block block-datatable"
+unless @block.title.blank?
$class += " block-with-title"
end
%>
<section class="<%= $class %>">
<div class="container">
<div class="block-content">
- <% unless @block.title.empty? && @block.template.description.empty? %>
+ <% unless @block.title.blank? && @block.template.description.blank? %>
<div class="top">
- <% unless @block.title.empty? %>
+ <% unless @block.title.blank? %>
<h2><%= @block.title %></h2>
<% end %>
- <% unless @block.template.description.empty? %>
+ <% unless @block.template.description.blank? %>
<div class="description">
<p><%= block_component_preview :description %></p>
</div>
@@ -21,7 +21,7 @@ end
<% end %>
<div class="table-responsive">
<table>
- <% unless @block.template.caption.empty? %>
+ <% unless @block.template.caption.blank? %>
<caption><%= block_component_preview :caption %></caption>
<% end %>
<thead>
diff --git a/app/views/admin/communication/blocks/templates/definitions/_preview.html.erb b/app/views/admin/communication/blocks/templates/definitions/_preview.html.erb
index 62af80feb..6770c718d 100644
--- a/app/views/admin/communication/blocks/templates/definitions/_preview.html.erb
+++ b/app/views/admin/communication/blocks/templates/definitions/_preview.html.erb
@@ -1,6 +1,6 @@
<%
- $class = "block block-definitions"
- unless @block.title.empty?
+ $class = "block block-definitions"
+ unless @block.title.blank?
$class += " block-with-title"
end
%>
@@ -8,12 +8,12 @@
<section class="<%= $class %>">
<div class="container">
<div class="block-content">
- <% unless @block.title.empty? && @block.template.description.empty? %>
+ <% unless @block.title.blank? && @block.template.description.blank? %>
<div class="top">
- <% unless @block.title.empty? %>
+ <% unless @block.title.blank? %>
<h2><%= @block.title %></h2>
<% end %>
- <% unless @block.template.description.empty? %>
+ <% unless @block.template.description.blank? %>
<div class="description">
<p><%= block_component_preview :description %></p>
</div>
diff --git a/app/views/admin/communication/blocks/templates/files/_preview.html.erb b/app/views/admin/communication/blocks/templates/files/_preview.html.erb
index d216be4a0..54f327456 100644
--- a/app/views/admin/communication/blocks/templates/files/_preview.html.erb
+++ b/app/views/admin/communication/blocks/templates/files/_preview.html.erb
@@ -1,6 +1,6 @@
<%
-$class = "block block-files"
-unless @block.title.empty?
+$class = "block block-files"
+unless @block.title.blank?
$class += " block-with-title"
end
%>
@@ -8,19 +8,19 @@ end
<section class="<%= $class %>">
<div class="container">
<div class="block-content">
- <% unless @block.title.empty? && @block.template.description.empty? %>
+ <% unless @block.title.blank? && @block.template.description.blank? %>
<div class="top">
- <% unless @block.title.empty? %>
+ <% unless @block.title.blank? %>
<h2><%= @block.title %></h2>
<% end %>
- <% unless @block.template.description.empty? %>
+ <% unless @block.template.description.blank? %>
<div class="description">
<p><%= block_component_preview :description %></p>
</div>
<% end %>
</div>
<% end %>
-
+
<ul class="files">
<% @block.template.elements.each do |element| %>
<% next unless element.blob %>
diff --git a/app/views/admin/communication/blocks/templates/gallery/_preview.html.erb b/app/views/admin/communication/blocks/templates/gallery/_preview.html.erb
index 9b2901cf2..fadc3f4aa 100644
--- a/app/views/admin/communication/blocks/templates/gallery/_preview.html.erb
+++ b/app/views/admin/communication/blocks/templates/gallery/_preview.html.erb
@@ -1,6 +1,6 @@
<%
-$class = "block block-gallery"
-unless @block.title.empty?
+$class = "block block-gallery"
+unless @block.title.blank?
$class += " block-with-title"
end
@@ -11,12 +11,12 @@ $class += " block-gallery--" + @block.template.layout
<div class="container">
<div class="block-content">
<div class="top">
- <% unless @block.title.empty? && @block.template.description.empty? %>
+ <% unless @block.title.blank? && @block.template.description.blank? %>
<div class="top">
- <% unless @block.title.empty? %>
+ <% unless @block.title.blank? %>
<h2><%= @block.title %></h2>
<% end %>
- <% unless @block.template.description.empty? %>
+ <% unless @block.template.description.blank? %>
<div class="description">
<p><%= block_component_preview :description %></p>
</div>
@@ -30,7 +30,7 @@ $class += " block-gallery--" + @block.template.layout
<div class="splide__track">
<div class="splide__list">
<% end %>
- <% @block.template.elements.each do |element| %>
+ <% @block.template.elements.each do |element| %>
<%= block_component_preview :image, template: element %>
<% end %>
<% if !@block.template.elements.one? %>
@@ -40,7 +40,7 @@ $class += " block-gallery--" + @block.template.layout
<% end %>
<% else %>
<div class="gallery" role="group">
- <% @block.template.elements.each do |element| %>
+ <% @block.template.elements.each do |element| %>
<%= block_component_preview :image, template: element %>
<% end %>
</div>
diff --git a/app/views/admin/communication/blocks/templates/image/_preview.html.erb b/app/views/admin/communication/blocks/templates/image/_preview.html.erb
index 7974851a3..cdb2997ed 100644
--- a/app/views/admin/communication/blocks/templates/image/_preview.html.erb
+++ b/app/views/admin/communication/blocks/templates/image/_preview.html.erb
@@ -1,14 +1,14 @@
<%
-$class = "block block-image"
+$class = "block block-image"
-unless @block.title.empty?
+unless @block.title.blank?
$class += " block-with-title"
end
%>
<section class="<%= $class %>">
<div class="container">
<div class="block-content">
- <% unless @block.title.empty? %>
+ <% unless @block.title.blank? %>
<div class="top">
<h2><%= @block.title %></h2>
</div>
diff --git a/app/views/admin/communication/blocks/templates/key_figures/_preview.html.erb b/app/views/admin/communication/blocks/templates/key_figures/_preview.html.erb
index 6dab91357..4ca7f51f6 100644
--- a/app/views/admin/communication/blocks/templates/key_figures/_preview.html.erb
+++ b/app/views/admin/communication/blocks/templates/key_figures/_preview.html.erb
@@ -1,18 +1,18 @@
<%
-$class = "block block-key_figures"
-unless @block.title.empty?
+$class = "block block-key_figures"
+unless @block.title.blank?
$class += " block-with-title"
end
%>
<section class="<%= $class %>">
<div class="container">
<div class="block-content">
- <% unless @block.title.empty? && @block.template.description.empty? %>
+ <% unless @block.title.blank? && @block.template.description.blank? %>
<div class="top">
- <% unless @block.title.empty? %>
+ <% unless @block.title.blank? %>
<h2><%= @block.title %></h2>
<% end %>
- <% unless @block.template.description.empty? %>
+ <% unless @block.template.description.blank? %>
<div class="description">
<p><%= block_component_preview :description %></p>
</div>
diff --git a/app/views/admin/communication/blocks/templates/testimonials/_preview.html.erb b/app/views/admin/communication/blocks/templates/testimonials/_preview.html.erb
index f9704ebdb..b8c2e89d9 100644
--- a/app/views/admin/communication/blocks/templates/testimonials/_preview.html.erb
+++ b/app/views/admin/communication/blocks/templates/testimonials/_preview.html.erb
@@ -1,6 +1,6 @@
<%
- $class = "block block-testimonials"
- unless @block.title.empty?
+ $class = "block block-testimonials"
+ unless @block.title.blank?
$class += " block-with-title"
end
if !@block.template.elements.one?
@@ -13,7 +13,7 @@
<div class="block-content">
<div class="testimonials">
<% if !@block.template.elements.one? %>
- <div class="splide"
+ <div class="splide"
data-splide='{
"arrows":false,
"autoplay":true,
diff --git a/app/views/admin/communication/blocks/templates/timeline/_preview.html.erb b/app/views/admin/communication/blocks/templates/timeline/_preview.html.erb
index 81a435c18..d52b51e2b 100644
--- a/app/views/admin/communication/blocks/templates/timeline/_preview.html.erb
+++ b/app/views/admin/communication/blocks/templates/timeline/_preview.html.erb
@@ -1,6 +1,6 @@
<%
- $class = "block block-timeline"
- unless @block.title.empty?
+ $class = "block block-timeline"
+ unless @block.title.blank?
$class += " block-with-title"
end
$class += " block-timeline--" + @block.template.layout
@@ -10,7 +10,7 @@
<div class="container">
<% if @block.template.layout == "vertical" %>
<div class="block-content">
- <% unless @block.title.empty? %>
+ <% unless @block.title.blank? %>
<div class="top">
<h2><%= @block.title %></h2>
</div>
@@ -28,7 +28,7 @@
</div>
<% else %>
<div class="timeline">
- <% unless @block.title.empty? %>
+ <% unless @block.title.blank? %>
<h2><%= @block.title %></h2>
<% end %>
<div class="events">
diff --git a/app/views/admin/communication/blocks/templates/video/_preview.html.erb b/app/views/admin/communication/blocks/templates/video/_preview.html.erb
index 2586d6de4..1dc6895c1 100644
--- a/app/views/admin/communication/blocks/templates/video/_preview.html.erb
+++ b/app/views/admin/communication/blocks/templates/video/_preview.html.erb
@@ -1,13 +1,13 @@
<%
$class = "block block-video"
-unless @block.title.empty?
+unless @block.title.blank?
$class += " block-with-title"
end
%>
<section class="<%= $class %>">
<div class="container">
<div class="block-content">
- <% unless @block.title.empty? %>
+ <% unless @block.title.blank? %>
<div class="top">
<h2><%= @block.title %></h2>
</div>
diff --git a/app/views/admin/research/laboratories/axes/show.html.erb b/app/views/admin/research/laboratories/axes/show.html.erb
index e0691afb6..307fee70f 100644
--- a/app/views/admin/research/laboratories/axes/show.html.erb
+++ b/app/views/admin/research/laboratories/axes/show.html.erb
@@ -3,7 +3,7 @@
<div class="row">
<div class="col-md-8">
<%= osuny_panel t('content') do %>
- <% unless @axis.short_name.empty? %>
+ <% unless @axis.short_name.blank? %>
<%= osuny_label Research::Laboratory::Axis.human_attribute_name('short_name') %>
<p><%= @axis.short_name %></p>
<% end %>
--
GitLab