From b9d254dfbec04814a5301ee1f49a3793cf763716 Mon Sep 17 00:00:00 2001
From: Florent Bruneau <florent.bruneau@polytechnique.org>
Date: Tue, 28 Sep 2010 14:44:09 +0200
Subject: [PATCH] Make profile edition link available from minifiches and
 profile when the current user have edit_directory permissions.

Signed-off-by: Florent Bruneau <florent.bruneau@polytechnique.org>
---
 core                            |  2 +-
 templates/include/minifiche.tpl | 11 ++++++++++-
 templates/profile/profile.tpl   |  3 ++-
 3 files changed, 13 insertions(+), 3 deletions(-)

diff --git a/core b/core
index 6e4c4ea..a2efe30 160000
--- a/core
+++ b/core
@@ -1 +1 @@
-Subproject commit 6e4c4ead2d8c7e55e9fc9c925130b8425b4ec585
+Subproject commit a2efe30f0470b8150e70189e6f8d9d7d8601ea87
diff --git a/templates/include/minifiche.tpl b/templates/include/minifiche.tpl
index 0daa537..16dac4f 100644
--- a/templates/include/minifiche.tpl
+++ b/templates/include/minifiche.tpl
@@ -74,6 +74,7 @@
     {if $registered || (!$dead && $hasowner)}
     <div>
       {if !$registered && !$dead && $hasowner}
+        {if hasPerm('directory_private')}
         {if !$smarty.session.user->isWatchedUser($profile)}
     <a href="carnet/notifs/add_nonins/{$user->login()}?token={xsrf_token}">{*
     *}{icon name=add title="Ajouter à la liste de mes surveillances"}</a>
@@ -81,6 +82,7 @@
     <a href="carnet/notifs/del_nonins/{$user->login()}?token={xsrf_token}">{*
     *}{icon name=cross title="Retirer de la liste de mes surveillances"}</a>
         {/if}
+        {/if}
       {elseif $registered}
     <a href="profile/{$profile->hrid()}" class="popup2">{*
     *}{icon name=user_suit title="Afficher la fiche"}</a>
@@ -89,6 +91,7 @@
     *}{icon name=vcard title="Afficher la carte de visite"}</a>
     <a href="mailto:{$user->bestEmail()}">{*
     *}{icon name=email title="Envoyer un email"}</a>
+          {if hasPerm('directory_private')}
           {if !$smarty.session.user->isContact($profile)}
     <a href="carnet/contacts?action=ajouter&amp;user={$profile->hrid()}&amp;token={xsrf_token}">{*
     *}{icon name=add title="Ajouter à mes contacts"}</a>
@@ -96,12 +99,18 @@
     <a href="carnet/contacts?action=retirer&amp;user={$profile->hrid()}&amp;token={xsrf_token}">{*
     *}{icon name=cross title="Retirer de mes contacts"}</a>
           {/if}
+          {/if}
         {/if}
       {/if}
     </div>
     {/if}
 
-    {if hasPerm('admin') && $hasowner}
+    {if hasPerm('edit_directory')}
+    <div>
+      [<a href="profile/edit/{$user->login()}">{*
+         *}{icon name=user_edit title="modifier la fiche"}</a>]
+    </div>
+    {elseif hasPerm('admin') && $hasowner}
     <div>
       [{if $registered && !$dead}
       <a href="marketing/private/{$user->login()}">{*
diff --git a/templates/profile/profile.tpl b/templates/profile/profile.tpl
index 926f807..863cbdc 100644
--- a/templates/profile/profile.tpl
+++ b/templates/profile/profile.tpl
@@ -108,8 +108,9 @@ function chgMainWinLoc(strPage)
 
         {if $owner->login() eq $smarty.session.hruid}
         <a href="javascript:chgMainWinLoc('profile/edit')">{icon name="user_edit" title="Modifier ma fiche"}</a>
+        {elseif hasPerm('edit_directory')}
+        <a href="javascript:chgMainWinLoc('profile/edit/{$profile->hrpid}')">{icon name="user_edit" title="Modifier cette fiche"}</a>
         {/if}
-
       {/if}
     </div>
 
-- 
2.1.4