From 3b9b1b7f80c3772921de02a42627dcd66b3666a9 Mon Sep 17 00:00:00 2001
From: Arnaud Levy <contact@arnaudlevy.com>
Date: Tue, 7 Mar 2023 15:33:12 +0100
Subject: [PATCH] fix
---
app/controllers/extranet/alumni/application_controller.rb | 2 +-
.../extranet/contacts/application_controller.rb | 2 +-
app/views/extranet/alumni/organizations/show.html.erb | 4 +++-
app/views/extranet/contacts/organizations/show.html.erb | 7 +++----
4 files changed, 8 insertions(+), 7 deletions(-)
diff --git a/app/controllers/extranet/alumni/application_controller.rb b/app/controllers/extranet/alumni/application_controller.rb
index 340b7599c..68fe1bb39 100644
--- a/app/controllers/extranet/alumni/application_controller.rb
+++ b/app/controllers/extranet/alumni/application_controller.rb
@@ -4,6 +4,6 @@ class Extranet::Alumni::ApplicationController < Extranet::ApplicationController
def breadcrumb
super
- add_breadcrumb University::Person::Alumnus.model_name.human(count: 2)
+ add_breadcrumb University::Person::Alumnus.model_name.human(count: 2), alumni_university_persons_path
end
end
\ No newline at end of file
diff --git a/app/controllers/extranet/contacts/application_controller.rb b/app/controllers/extranet/contacts/application_controller.rb
index b9e8ad412..29b5efccb 100644
--- a/app/controllers/extranet/contacts/application_controller.rb
+++ b/app/controllers/extranet/contacts/application_controller.rb
@@ -4,6 +4,6 @@ class Extranet::Contacts::ApplicationController < Extranet::ApplicationControlle
def breadcrumb
super
- add_breadcrumb Communication::Extranet.human_attribute_name(:feature_contacts)
+ add_breadcrumb Communication::Extranet.human_attribute_name(:feature_contacts), contacts_university_persons_path
end
end
\ No newline at end of file
diff --git a/app/views/extranet/alumni/organizations/show.html.erb b/app/views/extranet/alumni/organizations/show.html.erb
index e90c709e2..acd731b16 100644
--- a/app/views/extranet/alumni/organizations/show.html.erb
+++ b/app/views/extranet/alumni/organizations/show.html.erb
@@ -65,7 +65,9 @@
<% if @organization.url.present? %>
<dt><%= University::Organization.human_attribute_name(:url) %></dt>
<dd>
- <%= link_to @organization.url, @organization.url %>
+ <a href="<%= social_twitter_to_url @organization.url %>" target="_blank" rel="noreferrer">
+ <%= social_twitter_to_s @organization.url %>
+ </a>
</dd>
<% end %>
</dl>
diff --git a/app/views/extranet/contacts/organizations/show.html.erb b/app/views/extranet/contacts/organizations/show.html.erb
index 054d50140..c6e79be80 100644
--- a/app/views/extranet/contacts/organizations/show.html.erb
+++ b/app/views/extranet/contacts/organizations/show.html.erb
@@ -12,10 +12,7 @@
</div>
<div class="offset-md-1 col-md-3 order-1 order-md-2">
<%= kamifusen_tag @organization.logo, width: 400, class: 'img-fluid organization__logo' if @organization.logo.attached? %>
-
<dl>
- <dt><%= University::Organization.human_attribute_name(:kind) %></dt>
- <dd><%= @organization.kind_i18n %></dd>
<% if @organization.phone.present? %>
<dt><%= University::Organization.human_attribute_name(:phone) %></dt>
<dd><a href="tel:<%= @organization.phone %>" target="_blank" rel="noreferrer"><%= @organization.phone %></a></dd>
@@ -27,7 +24,9 @@
<% if @organization.url.present? %>
<dt><%= University::Organization.human_attribute_name(:url) %></dt>
<dd>
- <%= link_to @organization.url, @organization.url %>
+ <a href="<%= social_twitter_to_url @organization.url %>" target="_blank" rel="noreferrer">
+ <%= social_twitter_to_s @organization.url %>
+ </a>
</dd>
<% end %>
</dl>
--
GitLab