diff --git a/app/controllers/admin/users_controller.rb b/app/controllers/admin/users_controller.rb
index de26463477670a34d6a36fbaa83c14c23bf7e164..21384cb34a4cb9c4e03ca2b2585c9ab0057313fd 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 47ded2d779c9b8130fc550c697a9ea505cef683a..ace02aa0c1e5fadb66a76367bb8c6d0ba7fe53b4 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 14602622f75515cda898e4677d9a16d52ff1d32c..8cfedc5222a5fa063da0ae499c351d894ee5964e 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 223eae3bd898d779d7efa81d081dd0be4f90d274..99504282f19fa76477184e2409786a9fb51b61b4 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 1bf5febd1c1d0a7cb548f084399cdc78d61801e9..d54338223d29efe45d074a9beebd3e00f685a9de 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 6a03d093e686c5cb7e1b48d9f15ae8a4b2be2960..ae6f329affaf5a9a0e7150f7f70d05f4c046dfc3 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 f36ccec40db610e045ce3c58cde75630969ced50..1be71e833ea3c6e71f390bff03dba5d6877661ed 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 3ffb5a299fdd15e417451447d297829e6ac3f65e..9a617582b13cab08266f6fa1c5ab33d85cae7e28 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 4f28c5ab2a22c59949a857416b8188b71a36e63e..fdd161bde54b44ad473f41e1ef64b24d634e20d6 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 62af80feb66c094adcb5a493413aac9935b8b4e0..6770c718db2441be651771243356072bc485a695 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 d216be4a0be9c25f95ec5f8ca10b73b89fb0b318..54f32745652572c91bccae0cb1f3a9c0493b7812 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 9b2901cf2f8b23ba5938d548365a98dbc23edd6b..fadc3f4aa401aa1426ebf55e62b5c492fb4873eb 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 7974851a3ce20c28fc0e4f552f61b220052bfd44..cdb2997ed03d37cf8861f6581f40d0430957d78f 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 6dab913578249b03576ca3dbe438c444d700d5c5..4ca7f51f60737fd74aff8d0b24c857cfe1225354 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 f9704ebdb3151ff10f143f861ebfb215a83ca1ea..b8c2e89d9a2ccffd7558b8ee55403cd528deb6bd 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 81a435c18ab10f934ce1072ec88938664a85b96a..d52b51e2b9e76058476b0742e94d2239aa8d34ee 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 2586d6de489ce05709f4ed762c35fa689d1aa2ca..1dc6895c1543ca1fdabff59fcb57d0c5db5cdcd3 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 e0691afb6c498430efe9c1515bd44e99d6841459..307fee70fe72b075195f9d58d0bb3fa18f3cb6f4 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 %>