bug #484, tri des colonnes sans lien, archivage au lieu de suppression, tri par défau...

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

diff --git a/classes/pltableeditor.php b/classes/pltableeditor.php
index 58894d6..a2ea533 100644 (file)
--- a/classes/pltableeditor.php
+++ b/classes/pltableeditor.php
@@ -38,6 +38,10 @@ class PLTableEditor {
     var $nbfields;
     // the field for sorting entries
     var $sortfield;
+    // action to do to delete row:
+       // null => delete effectively, false => no deletion, SQL
+    var $delete_action;
+    var $delete_message;
     /* table editor for platal
      * $plname : the PLname of the page, ex: admin/payments
      * $table : the table to edit, ex: profile_medals
@@ -116,22 +120,41 @@ class PLTableEditor {
         if ($joindel)
             $this->jtables[$name] = array("joinid" => $joinid,"joinextra" => $joinextra?(" AND ".$joinextra):"");
     }
-
     // add a sort key
-    function add_sort_field($key, $desc = false)
+    function add_sort_field($key, $desc = false, $default = false)
     {
-        $this->sort[] = $key . ($desc ? ' DESC' : '');
+       if ($default) {
+                       $this->sortfield = $key . ($desc ? ' DESC' : '');
+               } else {
+               $this->sort[] = $key . ($desc ? ' DESC' : '');
+        }
+    }
+    // set an action when trying to delete row
+    function on_delete($action = NULL, $message = NULL)
+    {
+       $this->delete_action = $action;
+       $this->delete_message = $message;
     }
-
     // call when done
     function apply(&$page, $action, $id = false) {
         $page->changeTpl('table-editor.tpl');
         $list = true;
         if ($action == 'delete') {
-            foreach ($this->jtables as $table => $j)
-                XDB::execute("DELETE FROM {$table} WHERE {$j['joinid']} = {?}{$j['joinextra']}", $id);
-            XDB::execute("DELETE FROM {$this->table} WHERE {$this->idfield} = {?}",$id);
-            $page->trig("L'entrée ".$id." a été supprimée.");
+               if (!isset($this->delete_action)) {
+                   foreach ($this->jtables as $table => $j)
+                       XDB::execute("DELETE FROM {$table} WHERE {$j['joinid']} = {?}{$j['joinextra']}", $id);
+                   XDB::execute("DELETE FROM {$this->table} WHERE {$this->idfield} = {?}",$id);
+                   $page->trig("L'entrée ".$id." a été supprimée.");
+               } else if ($this->delete_action) {
+                       XDB::execute($this->delete_action, $id);
+                       if (isset($this->delete_message)) {
+                       $page->trig($this->delete_message);
+                       } else {
+                       $page->trig("L'entrée ".$id." a été supprimée.");
+                               }                       
+               } else {
+                   $page->trig("Impossible de supprimer l'entrée.");
+               }
         }
         if ($action == 'edit') {
             $r = XDB::query("SELECT * FROM {$this->table} WHERE {$this->idfield} = {?}",$id);
@@ -187,19 +210,17 @@ class PLTableEditor {
             } else
                 $page->trig("Impossible de mette à jour.");
         }
+        if ($action == 'sort') {
+               $this->sortfield = $id;
+        }
+        if ($action == 'sortdesc') {
+               $this->sortfield = $id.' DESC';
+        }
         if ($list) {
             // user can sort by field by clicking the title of the column
-            if ($action == 'sort' || $action == 'sortdesc') {
-                if (isset($this->vars[$id])) {
-                    // add this sort order after the others (chosen by dev)
-                    $this->add_sort_field($id, $action == 'sortdesc');
-                    // set as sortfield to reverse sort when clicking again
-                    if ($action == 'sort') {
-                        $this->sortfield = $id;
-                    } else {
-                        $this->sortfield = '';
-                    }
-                } 
+            if (isset($this->sortfield)) {
+                // add this sort order after the others (chosen by dev)
+                $this->add_sort_field($this->sortfield);
             }
             if (count($this->sort) > 0) {
                 $sort = 'ORDER BY ' . join($this->sort, ',');

diff --git a/modules/payment.php b/modules/payment.php
index 03fc95d..ff5c432 100644 (file)
--- a/modules/payment.php
+++ b/modules/payment.php
@@ -321,6 +321,8 @@ class PaymentModule extends PLModule
         $table_editor = new PLTableEditor('admin/payments','paiement.paiements','id');
         $table_editor->add_join_table('paiement.transactions','ref',true);
         $table_editor->add_sort_field('flags');
+        $table_editor->add_sort_field('id', true, true);
+        $table_editor->on_delete("UPDATE paiement.paiements SET flags = 'old' WHERE id = {?}", "Le paiement a été archivé");
         $table_editor->describe('text','intitulé',true);
         $table_editor->describe('url','site web',false);
         $table_editor->describe('montant_def','montant par défaut',false);

diff --git a/templates/table-editor.tpl b/templates/table-editor.tpl
index cfa08e9..df4100f 100644 (file)
--- a/templates/table-editor.tpl
+++ b/templates/table-editor.tpl
@@ -24,11 +24,17 @@
 <h1>{$title}</h1>
 
 {if $list}
-
+<script type="text/javascript">
+       {literal}
+       function redirect(a) {
+               document.location = a;
+       }
+       {/literal}
+</script>
 <table class="bicol">
 <tr>
   {foreach from=$t->vars item=myval key=myvar}{if $myval.display}
-    <th><a href='{$t->pl}/sort{if $t->sortfield eq $myvar}desc{/if}/{$myvar}'>{$myval.desc}</a></th>
+    <th style="cursor:pointer" onclick="redirect('{$t->pl}/sort{if $t->sortfield eq $myvar}desc{/if}/{$myvar}')">{$myval.desc}</th>
   {/if}{/foreach}
   {if !$hideactions}
   <th>action</th>