From 3ef867b972936264be45bfc03ed294d1a64fab09 Mon Sep 17 00:00:00 2001
From: Thibault Monnier <thibaultmonni@gmail.com>
Date: Fri, 18 Oct 2024 20:03:47 +0200
Subject: [PATCH 1/2] Only display "modifier ce message" is it hasn't been soft
 deleted

---
 app/views/shared/_post.html.erb | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/app/views/shared/_post.html.erb b/app/views/shared/_post.html.erb
index b160a1c4..aea3b275 100644
--- a/app/views/shared/_post.html.erb
+++ b/app/views/shared/_post.html.erb
@@ -53,12 +53,15 @@
   <% if can_edit %>
     <div class="modify">
       <% if kind == "message" %>
-        <a href='#' onclick='return Rolling.develop("<%= postfix %>", true)' id='LinkEdit<%= postfix %>'>Modifier ce message</a>
         <% unless ms.erased? %>
+          <a href='#' onclick='return Rolling.develop("<%= postfix %>", true)' id='LinkEdit<%= postfix %>'>Modifier ce message</a>
           | <%= link_to "Supprimer ce message", message_soft_destroy_path(ms), method: :put, id: "LinkSoftDelete#{ postfix }", data: { confirm: "Êtes-vous sûr de vouloir supprimer ce message ?" } %>
         <% end %>
         <% if current_user.sk.admin? %>
-           | <%= link_to "Supprimer totalement ce message", message_path(ms), method: :delete, id: "LinkDelete#{ postfix }", data: { confirm: "Êtes-vous sûr de vouloir supprimer ce message ?" }  %>
+          <% unless ms.erased? %>
+            |
+          <% end %>
+          <%= link_to "Supprimer totalement ce message", message_path(ms), method: :delete, id: "LinkDelete#{ postfix }", data: { confirm: "Êtes-vous sûr de vouloir supprimer ce message ?" }  %>
         <% end %>
       <% elsif kind == "contestsolution" %>
         <a href='#' onclick='return Rolling.develop("")'>Modifier la solution</a>

From fce84efafe4eb9b3de4840dff9b58d0d6fd6a12b Mon Sep 17 00:00:00 2001
From: Nicolas16 <nicolasradu16@gmail.com>
Date: Fri, 18 Oct 2024 20:51:44 +0200
Subject: [PATCH 2/2] Update app/views/shared/_post.html.erb

---
 app/views/shared/_post.html.erb | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/app/views/shared/_post.html.erb b/app/views/shared/_post.html.erb
index aea3b275..c0361b18 100644
--- a/app/views/shared/_post.html.erb
+++ b/app/views/shared/_post.html.erb
@@ -58,9 +58,7 @@
           | <%= link_to "Supprimer ce message", message_soft_destroy_path(ms), method: :put, id: "LinkSoftDelete#{ postfix }", data: { confirm: "Êtes-vous sûr de vouloir supprimer ce message ?" } %>
         <% end %>
         <% if current_user.sk.admin? %>
-          <% unless ms.erased? %>
-            |
-          <% end %>
+          <%= "|" unless ms.erased? %>
           <%= link_to "Supprimer totalement ce message", message_path(ms), method: :delete, id: "LinkDelete#{ postfix }", data: { confirm: "Êtes-vous sûr de vouloir supprimer ce message ?" }  %>
         <% end %>
       <% elsif kind == "contestsolution" %>