From 6fbc3476f85a0b76b9af786c216ae36e4fb87ed0 Mon Sep 17 00:00:00 2001
From: Florent Bruneau <florent.bruneau@polytechnique.org>
Date: Fri, 8 Oct 2010 10:03:00 +0200
Subject: [PATCH] Add profile edition link on minifiche.

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

diff --git a/templates/include/minifiche.tpl b/templates/include/minifiche.tpl
index 16dac4f..83ee3aa 100644
--- a/templates/include/minifiche.tpl
+++ b/templates/include/minifiche.tpl
@@ -105,21 +105,19 @@
     </div>
     {/if}
 
-    {if hasPerm('edit_directory')}
+    {if hasPerm('admin') || $smarty.session.user->canEdit($profile)}
     <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}
+      [{if hasPerm('admin') && $hasowner}{if !$registered && !$dead}
       <a href="marketing/private/{$user->login()}">{*
         *}{icon name=email title="marketter user"}</a>
       {/if}
       <a href="admin/user/{$user->login()}">{*
-      *}{icon name=wrench title="administrer user"}</a>
-      <a href="profile/ax/{$user->login()}">{*
-      *}{icon name=user_gray title="fiche AX"}</a>]
+      *}{icon name=wrench title="administrer user"}</a>{/if}{*
+      *}{if hasPerm('admin') || $smarty.session.user->canEdit($profile)}{*
+      *}<a href="profile/edit/{$user->login()}">{*
+      *}{icon name=user_edit title="modifier la fiche"}</a>{*
+      *}<a href="profile/ax/{$user->login()}">{*
+      *}{icon name=user_gray title="fiche AX"}</a>{/if}]
     </div>
     {/if}
   </div>
diff --git a/templates/profile/profile.tpl b/templates/profile/profile.tpl
index d02d153..95667c1 100644
--- a/templates/profile/profile.tpl
+++ b/templates/profile/profile.tpl
@@ -106,10 +106,12 @@ function chgMainWinLoc(strPage)
           {icon name=wrench title="administrer user"}</a>
         {/if}
 
-        {if $owner->login() eq $smarty.session.hruid}
+        {if $smarty.session.user->isMyProfile($profile)}
         <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>
+        {elseif hasPerm('admin') || $smarty.session.user->canEdit($profile)}
+        <a href="javascript:chgMainWinLoc('profile/edit/{$profile->hrpid}')">
+          {icon name=user_edit title="modifier la fiche"}
+        </a>
         {/if}
       {/if}
     </div>
-- 
2.1.4