X-Git-Url: http://git.polytechnique.org/?a=blobdiff_plain;f=templates%2Ftable-editor.tpl;h=5a847a6fea5db5d3332358916111375c989289ab;hb=f6cfa61b4536e3a823508febe97317736dc16074;hp=3915794e98f04fe13d846b6639b0f58af8b72fec;hpb=7b64cc7438eba834c765eef056628e2f1e6ea823;p=platal.git

diff --git a/templates/table-editor.tpl b/templates/table-editor.tpl
index 3915794..5a847a6 100644
--- a/templates/table-editor.tpl
+++ b/templates/table-editor.tpl
@@ -1,6 +1,6 @@
 {**************************************************************************}
 {*                                                                        *}
-{*  Copyright (C) 2003-2008 Polytechnique.org                             *}
+{*  Copyright (C) 2003-2011 Polytechnique.org                             *}
 {*  http://opensource.polytechnique.org/                                  *}
 {*                                                                        *}
 {*  This program is free software; you can redistribute it and/or modify  *}
@@ -33,7 +33,7 @@
 </script>
 <table class="bicol">
 <tr>
-  {foreach from=$t->vars item=myval key=myvar}{if $myval.display}
+  {foreach from=$t->vars item=myval key=myvar}{if $myval.display_list}
     <th style="cursor:pointer" onclick="redirect('{$t->pl}/sort{if $t->sortfield eq $myvar && !$t->sortdesc}desc{/if}/{$myvar}')">{$myval.desc}{if $t->sortfield eq $myvar}{if $t->sortdesc}{icon name="bullet_arrow_down"}{else}{icon name="bullet_arrow_up"}{/if}{/if}</th>
   {/if}{/foreach}
   {if !$hideactions}
@@ -54,18 +54,23 @@
 {/if}
 {iterate from=$list item=myrow}
 <tr class="{cycle values="pair,impair"}">
-{foreach from=$t->vars item=myval}{if $myval.display}
+{foreach from=$t->vars item=myval}{if $myval.display_list}
   <td>
     {assign var="myfield" value=$myval.Field}
     {if $myfield eq $t->idfield}
         {assign var="idval" value=$myrow.$myfield}
     {/if}
+    {if $t->idfield2 && $myfield eq $t->idfield2}
+        {assign var="idval2" value=$myrow.$myfield}
+    {/if}
     {if $myval.Type eq 'timestamp'}
       <span class="smaller">{$myrow.$myfield|date_format:"%x %X"}</span>
     {elseif $myval.Type eq 'checkbox'}
       <input type="checkbox" disabled="disabled"{if $myrow.$myfield} checked="checked"{/if}/>
     {elseif $myval.Type eq 'ip_address'}
       {$myrow.$myfield|uint_to_ip}
+    {elseif $myval.url}
+      <a href="{$platal->ns}{$myval.url}{$myrow.$myfield}">{$myrow.$myfield}</a>
     {else}
       {$myrow.$myfield}
     {/if}
@@ -73,11 +78,11 @@
 {/if}{/foreach}
   {if !$hideactions}
   <td class="action">
-    {if !$readonly and !$deleteonly}
+    {if !$readonly and !$deleteonly and !addonly}
     <a href="{$t->pl}/edit/{$idval}">{icon name=page_edit title='éditer'}</a>
     {/if}
-    {if !$readonly}
-    <a href="{$t->pl}/delete/{$idval}?token={xsrf_token}">{icon name=delete title='supprimer'}</a>
+    {if !$readonly and !$addonly}
+    <a href="{$t->pl}/delete/{$idval}{if t($idval2)}/{$idval2}{/if}?token={xsrf_token}">{icon name=delete title='supprimer'}</a>
     {/if}
   </td>
   {/if}
@@ -106,14 +111,14 @@
   <table class="bicol">
     <tr class="impair">
       <th colspan="2">
-        {if $id}
-            modification de l'entrée 
+        {if $id !== null}
+            modification de l'entrée
         {else}
             nouvelle entrée
         {/if}
       </th>
     </tr>
-    {foreach from=$t->vars item=myval}{assign var="myfield" value=$myval.Field}{if ($myfield neq $t->idfield) or ($t->idfield_editable)}
+    {foreach from=$t->vars item=myval}{assign var="myfield" value=$myval.Field}{if (($myfield neq $t->idfield) or ($t->idfield_editable)) and $myval.display_item}
     <tr class="{cycle values="pair,impair"}">
       <td>
         <strong>{$myval.desc}</strong>