From: Stéphane Jacob <sj@m4x.org>
Date: Mon, 9 May 2011 08:59:33 +0000 (+0200)
Subject: Allows deletion of deceased contact/watched user (Closes #1486).
X-Git-Tag: xorg/1.1.1~7
X-Git-Url: http://git.polytechnique.org/?a=commitdiff_plain;h=7d13eea95c088077a34030901df72c8061aaa5d1;p=platal.git

Allows deletion of deceased contact/watched user (Closes #1486).

Signed-off-by: Stéphane Jacob <sj@m4x.org>
---

diff --git a/ChangeLog b/ChangeLog
index 4cd3f0d..b8f8025 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -12,6 +12,9 @@ Bug/Wish:
         - #1474: Provides accounts data for accounts without profile       -JAC
         - #1476: Logs last use of Auth-Groupe-X keys                       -JAC
 
+    * Carnet:
+        - #1486: Allows deletion of deceased contact/watched user          -JAC
+
     * Core:
         - #1484: Fix reference to is_IE that does not exist anymore        -FRU
 
diff --git a/templates/include/minifiche.tpl b/templates/include/minifiche.tpl
index 244ae3d..08b8026 100644
--- a/templates/include/minifiche.tpl
+++ b/templates/include/minifiche.tpl
@@ -103,6 +103,16 @@
         {/if}
       {/if}
     </div>
+    {elseif hasPerm('directory_private') && $hasowner && $dead}
+    <div>
+      {if $smarty.session.user->isWatchedUser($profile)}
+      <a href="carnet/notifs/del_nonins/{$user->login()}?token={xsrf_token}">{*
+      *}{icon name=cross title="Retirer de la liste de mes surveillances"}</a>
+      {elseif $smarty.session.user->isContact($profile)}
+      <a href="carnet/contacts?action=retirer&amp;user={$profile->hrid()}&amp;token={xsrf_token}">{*
+      *}{icon name=cross title="Retirer de mes contacts"}</a>
+      {/if}
+    </div>
     {/if}
 
     {if hasPerm('admin') || ($smarty.session.user->canEdit($profile) && !$smarty.session.user->isMe($user))}