Merge remote branch 'origin/xorg/maint' into xorg/1.0.2/master

[platal.git] / templates / admin / validation.tpl

diff --git a/templates/admin/validation.tpl b/templates/admin/validation.tpl
index 970e2f9..b043382 100644 (file)
--- a/templates/admin/validation.tpl
+++ b/templates/admin/validation.tpl
@@ -37,7 +37,7 @@ function toggleField(name, id, obj) {
 
 {iterate item=valid from=$vit}
 {assign var=type value=$valid->type}
-{if !$hide_requests[$type]}
+{if !t($hide_requests[$type]) && !($valid->requireAdmin && !$isAdmin)}
 <br />
 <table class="bicol">
   <tr>
@@ -46,11 +46,24 @@ function toggleField(name, id, obj) {
   <tr>
     <td class="titre" style="width: 20%">Demandeur&nbsp;:</td>
     <td>
-      <a href="profile/{$valid->user->login()}" class="popup2">
-        {$valid->user->fullName()} ({$valid->user->promo()})
+      {if $valid->user->hasProfile()}
+      {assign var="profile" value=$valid->user->profile()}
+      <a href="profile/{$profile->hrpid}" class="popup2">
+      {/if}
+        {$valid->user->fullName("promo")}
       </a>
     </td>
   </tr>
+  {if $valid->profile && !$valid->userIsProfileOwner}
+  <tr>
+    <td class="titre" style="width: 20%">Profil concerné&nbsp;:</td>
+    <td>
+      <a href="profile/{$valid->profile->hrpid}" class="popup2">
+        {$valid->profile->fullName("promo")}
+      </a>
+    </td>
+  </tr>
+  {/if}
   <tr>
     <td class="titre" style="width: 20%">Date de demande&nbsp;:</td>
     <td>
@@ -136,7 +149,7 @@ function toggleField(name, id, obj) {
         <div>
           Réponse préremplie&nbsp;:
           <select onchange="this.form.comm.value=this.value">
-            <option value=""></option>
+            <option value="">&nbsp;</option>
             {foreach from=$valid->answers() item=automatic_answer}
               <option value="{$automatic_answer.answer}">{$automatic_answer.title}</option>
             {/foreach}
@@ -179,7 +192,7 @@ function toggleField(name, id, obj) {
 
 <form action="admin/validate" method="post">
   {foreach from=$categories item=type}
-    <div style="float:left;width:33%"><input type="checkbox" name="{$type}" id="hide_{$type}"{if !$hide_requests[$type]} checked="checked"{/if}/>
+    <div style="float:left;width:33%"><input type="checkbox" name="{$type}" id="hide_{$type}"{if !t($hide_requests[$type])} checked="checked"{/if}/>
     <label for="hide_{$type}">{$type}</label></div>
   {/foreach}
   <div class="center" style="clear:left"><input type="submit" name="hide" value="Valider" /></div>