[Phpcompta-dev] r4310 - in phpcompta/trunk: html html/js include

[phpcompta-dev]

Author: danydb
Date: 2011-11-04 11:28:24 +0100 (Fri, 04 Nov 2011)
New Revision: 4310

Removed:
   phpcompta/trunk/html/remove_op.php
Modified:
   phpcompta/trunk/html/ajax_misc.php
   phpcompta/trunk/html/js/anc_script.js
   phpcompta/trunk/include/class_anc_operation.php
Log:

Ajax : put remove_op.php into ajax_misc.php

Modified: phpcompta/trunk/html/ajax_misc.php
===================================================================
--- phpcompta/trunk/html/ajax_misc.php  2011-11-03 23:12:14 UTC (rev 4309)
+++ phpcompta/trunk/html/ajax_misc.php  2011-11-04 10:28:24 UTC (rev 4310)
@@ -63,6 +63,10 @@
 $html=var_export($_REQUEST,true);
 switch($op)
 {
+       case "remove_anc":
+               if ($user->check_action(CAOD))
+               $cn->exec_sql("delete from operation_analytique where 
oa_group=$1",array($_GET['oa']));
+               break;
 case "rm_stock":
   require_once('constant.security.php');
   if ( $user->check_action(GESTOCK) == 0 )

Modified: phpcompta/trunk/html/js/anc_script.js
===================================================================
--- phpcompta/trunk/html/js/anc_script.js       2011-11-03 23:12:14 UTC (rev 
4309)
+++ phpcompta/trunk/html/js/anc_script.js       2011-11-04 10:28:24 UTC (rev 
4310)
@@ -251,16 +251,16 @@
  address@hidden p_dossier is the folder
  address@hidden p_oa_group is the group of the analytic operation
  */
-function op_remove(p_dossier,p_oa_group)
+function anc_remove_operation(p_dossier,p_oa_group)
 {
     var a=confirm("Etes-vous sur de vouloir effacer cette operation ?\n");
     if ( a == false ) return;
 var obj={"oa":
          p_oa_group,"gDossier":
-             p_dossier};
-    queryString=encodeJSON(obj);
+             p_dossier,"op":"remove_anc"};
+    var queryString=encodeJSON(obj);
     g(p_oa_group).style.display='none';
-    var e=new Ajax.Request("remove_op.php",
+    var e=new Ajax.Request("ajax_misc.php",
                        {method:'get',parameters:queryString});
 
 }

Deleted: phpcompta/trunk/html/remove_op.php
===================================================================
--- phpcompta/trunk/html/remove_op.php  2011-11-03 23:12:14 UTC (rev 4309)
+++ phpcompta/trunk/html/remove_op.php  2011-11-04 10:28:24 UTC (rev 4310)
@@ -1,41 +0,0 @@
-<?php
-/*
- *   This file is part of PhpCompta.
- *
- *   PhpCompta is free software; you can redistribute it and/or modify
- *   it under the terms of the GNU General Public License as published by
- *   the Free Software Foundation; either version 2 of the License, or
- *   (at your option) any later version.
- *
- *   PhpCompta is distributed in the hope that it will be useful,
- *   but WITHOUT ANY WARRANTY; without even the implied warranty of
- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *   GNU General Public License for more details.
- *
- *   You should have received a copy of the GNU General Public License
- *   along with PhpCompta; if not, write to the Free Software
- *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
-*/
-/* $Revision$ */
-
-// Copyright Author Dany De Bontridder address@hidden
-
-/*!\file
- *
- *
- * \brief from ajax, remove op. CA
- *
- */
-
-require_once('class_database.php');
-require_once ("class_user.php");
-require_once('class_dossier.php');
-require_once ('class_user.php');
-$gDossier=dossier::id();
-
-$cn=new Database($gDossier);
-$User=new User($cn);
-$User->Check();
-if ($User->check_action(CAOD))
-    $cn->exec_sql("delete from operation_analytique where 
oa_group=$1",array($_GET['oa']));
-?>

Modified: phpcompta/trunk/include/class_anc_operation.php
===================================================================
--- phpcompta/trunk/include/class_anc_operation.php     2011-11-03 23:12:14 UTC 
(rev 4309)
+++ phpcompta/trunk/include/class_anc_operation.php     2011-11-04 10:28:24 UTC 
(rev 4310)
@@ -210,7 +210,7 @@
                 {
 
                     $efface=new IButton();
-                    
$efface->javascript="op_remove(".$gDossier.",".$oldgroup.")";
+                    
$efface->javascript="anc_remove_operation(".$gDossier.",".$oldgroup.")";
                     $efface->name="Efface";
                     $efface->label="Efface";
                     $ret.="<td>".$efface->input()."</td>";
@@ -268,7 +268,7 @@
 
 
         $efface=new IButton();
-        $efface->javascript="op_remove("."$gDossier,".$oldgroup.")";
+        $efface->javascript="anc_remove_operation("."$gDossier,".$oldgroup.")";
         $efface->name="Efface";
         $efface->label="Efface";
         $ret.="<td>".$efface->input()."</td>";