X-Git-Url: http://git.polytechnique.org/?a=blobdiff_plain;f=templates%2Fprofile%2Fadresses.address.tpl;h=223629b4b4815419a138ce7a787bb859a8505542;hb=4555d49036d51e04d2a55e1ed11c5c1b3de3feb9;hp=69dd6d0ee7ea7baaa79ce609b5e601aa94267627;hpb=9b42c0b551d0ce7286e5b719ab49959829e99031;p=platal.git

diff --git a/templates/profile/adresses.address.tpl b/templates/profile/adresses.address.tpl
index 69dd6d0..223629b 100644
--- a/templates/profile/adresses.address.tpl
+++ b/templates/profile/adresses.address.tpl
@@ -22,10 +22,14 @@
 
 {assign var=prefname value="addresses[$i]"}
 {assign var=prefid value="addresses_$i"}
-{if !hasPerm('directory_private') && ($address.pub eq 'private') && !$new}
-{assign var=hiddenaddr value=true}
+{if $isMe || hasPerm('admin') || $new}
+  {assign var=hiddenaddr value=false}
+{elseif hasPerm('directory_hidden') || (($address.pub neq 'hidden') && ($address.pub neq 'private'))}
+  {assign var=hiddenaddr value=false}
+{elseif hasPerm('directory_private') && ($address.pub neq 'hidden')}
+  {assign var=hiddenaddr value=false}
 {else}
-{assign var=hiddenaddr value=false}
+  {assign var=hiddenaddr value=true}
 {/if}
 
 <table class="bicol" style="display: none; margin-bottom: 1em" id="{$prefid}_grayed">