Do not show edition form if we do not need it

git-svn-id: svn+ssh://murphy/home/svn/platal/trunk@925 839d8a87-29fc-0310-9880-83ba4fa771e5

diff --git a/include/validations.inc.php b/include/validations.inc.php
index 4415ebc..a49edce 100644 (file)
--- a/include/validations.inc.php
+++ b/include/validations.inc.php
@@ -331,6 +331,14 @@ class Validate
     }
 
     // }}}
+    // {{{ function id()
+
+    function id()
+    {
+        return $this->uid . '_' . $this->type . '_' . $this->stamp;
+    }
+
+    // }}}
 }
 
 foreach (glob(dirname(__FILE__).'/validations/*.inc.php') as $file) {

diff --git a/modules/admin.php b/modules/admin.php
index 8d59296..0191b80 100644 (file)
--- a/modules/admin.php
+++ b/modules/admin.php
@@ -688,11 +688,15 @@ class AdminModule extends PLModule
         }
     }
 
-    function handler_validate(&$page) {
+    function handler_validate(&$page, $action = 'list', $id = null) {
         $page->changeTpl('admin/valider.tpl');
         $page->assign('xorg_title','Polytechnique.org - Administration - Valider une demande');
         require_once("validations.inc.php");
 
+        if ($action == 'edit' and !is_null($id)) {
+            $page->assign('preview_id', $id);
+        }
+
         if(Env::has('uid') && Env::has('type') && Env::has('stamp')) {
             $req = Validate::get_request(Env::v('uid'), Env::v('type'), Env::v('stamp'));
             if($req) { $req->handle_formu(); }

diff --git a/templates/admin/valider.tpl b/templates/admin/valider.tpl
index 5a56ea1..282eb9b 100644 (file)
--- a/templates/admin/valider.tpl
+++ b/templates/admin/valider.tpl
@@ -53,7 +53,8 @@
   {if $valid->editor()}
   <tr>
     <td colspan="2" class="center">
-      <form enctype="multipart/form-data" action="admin/validate" method="post">
+      {if $preview_id == $valid->id()}
+      <form enctype="multipart/form-data" action="{$platal->pl_self()}" method="post">
         <div>
           {include file=$valid->editor()}
           <input type="hidden" name="uid"    value="{$valid->uid}" />
@@ -63,6 +64,11 @@
           <input type="submit" name="edit"   value="Editer" />
         </div>
       </form>
+      {else}
+      <small>
+        <a href="admin/validate/edit/{$valid->id()}">Editer cette demande avant validation</a>
+      </small>
+      {/if}
     </td>
   </tr>
   {/if}