From 7d13eea95c088077a34030901df72c8061aaa5d1 Mon Sep 17 00:00:00 2001 From: =?utf8?q?St=C3=A9phane=20Jacob?= Date: Mon, 9 May 2011 10:59:33 +0200 Subject: [PATCH] Allows deletion of deceased contact/watched user (Closes #1486). MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Signed-off-by: Stéphane Jacob --- ChangeLog | 3 +++ templates/include/minifiche.tpl | 10 ++++++++++ 2 files changed, 13 insertions(+) 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} + {elseif hasPerm('directory_private') && $hasowner && $dead} +
+ {if $smarty.session.user->isWatchedUser($profile)} + {* + *}{icon name=cross title="Retirer de la liste de mes surveillances"} + {elseif $smarty.session.user->isContact($profile)} + {* + *}{icon name=cross title="Retirer de mes contacts"} + {/if} +
{/if} {if hasPerm('admin') || ($smarty.session.user->canEdit($profile) && !$smarty.session.user->isMe($user))} -- 2.1.4