From 5cd01701f2d7c9b894e145f37315417a22fd48ad Mon Sep 17 00:00:00 2001
From: Arnaud Levy <contact@arnaudlevy.com>
Date: Thu, 24 Mar 2022 09:05:09 +0100
Subject: [PATCH] destroy

---
 app/views/admin/education/programs/show.html.erb        | 5 ++++-
 app/views/admin/education/schools/show.html.erb         | 5 ++++-
 app/views/admin/research/journal/articles/show.html.erb | 5 ++++-
 app/views/admin/research/journal/volumes/show.html.erb  | 5 ++++-
 app/views/admin/research/journals/show.html.erb         | 5 ++++-
 app/views/admin/research/laboratories/show.html.erb     | 5 ++++-
 app/views/admin/research/laboratory/axes/show.html.erb  | 5 ++++-
 app/views/admin/research/theses/show.html.erb           | 5 ++++-
 app/views/admin/university/organizations/show.html.erb  | 5 ++++-
 app/views/admin/university/people/show.html.erb         | 5 ++++-
 config/locales/university/en.yml                        | 7 +++++++
 config/locales/university/fr.yml                        | 7 +++++++
 12 files changed, 54 insertions(+), 10 deletions(-)

diff --git a/app/views/admin/education/programs/show.html.erb b/app/views/admin/education/programs/show.html.erb
index 8d9ed285e..0569878bd 100644
--- a/app/views/admin/education/programs/show.html.erb
+++ b/app/views/admin/education/programs/show.html.erb
@@ -122,8 +122,11 @@
   <% end %>
 <% end %>
 
+<% content_for :action_bar_left do %>
+  <%= destroy_link @program %>
+<% end %>
+
 <% content_for :action_bar_right do %>
   <%= preview_link %>
   <%= edit_link @program %>
-  <%= destroy_link @program %>
 <% end %>
diff --git a/app/views/admin/education/schools/show.html.erb b/app/views/admin/education/schools/show.html.erb
index 4ef8f5ae8..273d54396 100644
--- a/app/views/admin/education/schools/show.html.erb
+++ b/app/views/admin/education/schools/show.html.erb
@@ -58,7 +58,10 @@
 
 <%= render 'admin/education/schools/show/roles', roles: @roles %>
 
+<% content_for :action_bar_left do %>
+  <%= destroy_link @school %>
+<% end %>
+
 <% content_for :action_bar_right do %>
   <%= edit_link @school %>
-  <%= destroy_link @school %>
 <% end %>
diff --git a/app/views/admin/research/journal/articles/show.html.erb b/app/views/admin/research/journal/articles/show.html.erb
index da0caf4c5..303fe4093 100644
--- a/app/views/admin/research/journal/articles/show.html.erb
+++ b/app/views/admin/research/journal/articles/show.html.erb
@@ -54,7 +54,10 @@
   </div>
 </div>
 
+<% content_for :action_bar_left do %>
+  <%= destroy_link @article %>
+<% end %>
+
 <% content_for :action_bar_right do %>
   <%= edit_link @article %>
-  <%= destroy_link @article %>
 <% end %>
diff --git a/app/views/admin/research/journal/volumes/show.html.erb b/app/views/admin/research/journal/volumes/show.html.erb
index ecb910c39..26d0e416e 100644
--- a/app/views/admin/research/journal/volumes/show.html.erb
+++ b/app/views/admin/research/journal/volumes/show.html.erb
@@ -79,7 +79,10 @@
   </div>
 </div>
 
+<% content_for :action_bar_left do %>
+  <%= destroy_link @volume %>
+<% end %>
+
 <% content_for :action_bar_right do %>
   <%= edit_link @volume %>
-  <%= destroy_link @volume %>
 <% end %>
diff --git a/app/views/admin/research/journals/show.html.erb b/app/views/admin/research/journals/show.html.erb
index cd56929b1..3243b7306 100644
--- a/app/views/admin/research/journals/show.html.erb
+++ b/app/views/admin/research/journals/show.html.erb
@@ -55,7 +55,10 @@
   <%= render 'admin/research/journal/articles/list', articles: @articles %>
 </div>
 
+<% content_for :action_bar_left do %>
+  <%= destroy_link @journal %>
+<% end %>
+
 <% content_for :action_bar_right do %>
   <%= edit_link @journal %>
-  <%= destroy_link @journal %>
 <% end %>
diff --git a/app/views/admin/research/laboratories/show.html.erb b/app/views/admin/research/laboratories/show.html.erb
index 6c78d471c..38b6adcc7 100644
--- a/app/views/admin/research/laboratories/show.html.erb
+++ b/app/views/admin/research/laboratories/show.html.erb
@@ -14,7 +14,10 @@
   <%= render 'admin/research/laboratory/axes/list', axes: @axes %>
 </div>
 
+<% content_for :action_bar_left do %>
+  <%= destroy_link @laboratory %>
+<% end %>
+
 <% content_for :action_bar_right do %>
   <%= edit_link @laboratory %>
-  <%= destroy_link @laboratory %>
 <% end %>
diff --git a/app/views/admin/research/laboratory/axes/show.html.erb b/app/views/admin/research/laboratory/axes/show.html.erb
index 241fef013..52adb140e 100644
--- a/app/views/admin/research/laboratory/axes/show.html.erb
+++ b/app/views/admin/research/laboratory/axes/show.html.erb
@@ -20,7 +20,10 @@
   </div>
 </div>
 
+<% content_for :action_bar_left do %>
+  <%= destroy_link @axis %>
+<% end %>
+
 <% content_for :action_bar_right do %>
   <%= edit_link @axis %>
-  <%= destroy_link @axis %>
 <% end %>
diff --git a/app/views/admin/research/theses/show.html.erb b/app/views/admin/research/theses/show.html.erb
index 9e9880862..53a07b0ea 100644
--- a/app/views/admin/research/theses/show.html.erb
+++ b/app/views/admin/research/theses/show.html.erb
@@ -1,6 +1,9 @@
 <% content_for :title, @thesis %>
 
+<% content_for :action_bar_left do %>
+  <%= destroy_link @thesis %>
+<% end %>
+
 <% content_for :action_bar_right do %>
   <%= edit_link @thesis %>
-  <%= destroy_link @thesis %>
 <% end %>
diff --git a/app/views/admin/university/organizations/show.html.erb b/app/views/admin/university/organizations/show.html.erb
index 0a4a2e191..9d2dca4d2 100644
--- a/app/views/admin/university/organizations/show.html.erb
+++ b/app/views/admin/university/organizations/show.html.erb
@@ -55,7 +55,10 @@
   <%= @organization.kind %>
 </p>
 
+<% content_for :action_bar_left do %>
+  <%= destroy_link @organization %>
+<% end %>
+
 <% content_for :action_bar_right do %>
   <%= edit_link @organization %>
-  <%= destroy_link @organization %>
 <% end %>
diff --git a/app/views/admin/university/people/show.html.erb b/app/views/admin/university/people/show.html.erb
index c613c9003..db2e0f177 100644
--- a/app/views/admin/university/people/show.html.erb
+++ b/app/views/admin/university/people/show.html.erb
@@ -19,7 +19,10 @@
   </div>
 <% end %>
 
+<% content_for :action_bar_left do %>
+  <%= destroy_link @person %>
+<% end %>
+
 <% content_for :action_bar_right do %>
   <%= edit_link @person %>
-  <%= destroy_link @person %>
 <% end %>
diff --git a/config/locales/university/en.yml b/config/locales/university/en.yml
index 10e334422..c6bde4b0a 100644
--- a/config/locales/university/en.yml
+++ b/config/locales/university/en.yml
@@ -89,6 +89,13 @@ en:
         linkedin: "Example: https://www.linkedin.com/in/osuny"
         tenure: "To differ from temporary lecturer."
         twitter: "Example: osuny"
+  enums:
+    university:
+      organization:
+        kind:
+          company: Company
+          non_profit: Association
+          government: Government
   university:
     invoice_informations: Invoice informations
     person:
diff --git a/config/locales/university/fr.yml b/config/locales/university/fr.yml
index 43b7cb906..7d9c2c564 100644
--- a/config/locales/university/fr.yml
+++ b/config/locales/university/fr.yml
@@ -91,6 +91,13 @@ fr:
         linkedin: "Exemple : https://www.linkedin.com/in/osuny"
         tenure: "À différencier d'une personne vacataire."
         twitter: "Exemple : osuny"
+  enums:
+    university:
+      organization:
+        kind:
+          company: Entreprise
+          non_profit: Association
+          government: Structure gouvernementale
   university:
     invoice_informations: Données de facturation
     person:
-- 
GitLab