admingit/altocompta
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix problem with return button: the query must be saved

Browse source
This commit is contained in:
Dany De Bontridder 2012-05-27 22:57:08 +00:00
parent c135d96c83
commit 75cc0e7065
3 changed files with 4 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

2
include/action.common.inc.php
View file

@ -381,7 +381,7 @@ $str_ag_dest=$ag_dest->input();
// if a query is request build the sql stmt
$query="and (ag_title ~* '".sql_string($_REQUEST['query'])."' ".
"or ag_ref ='".trim(sql_string($_REQUEST['query'])).
"' or ag_comment ~* '".trim(sql_string($_REQUEST['query']))."'".
"' or ag_id in (select ag_id from action_gestion_comment where agc_comment ~* '".trim(sql_string($_REQUEST['query']))."')".
")";
}

2
include/action.inc.php
View file

@ -23,7 +23,7 @@
*/
require_once('class_ipopup.php');
global $g_user;
$retour=HtmlInput::button_anchor(_('Retour liste'),'?ac='.$_REQUEST['ac'].'&my_action&'.dossier::get()."&".HtmlInput::get_to_string(array("qcode","ag_dest","query","tdoc","date_start","date_end","see_all","all_action")));
$retour=HtmlInput::button_anchor(_('Retour liste'),HtmlInput::get_to_string(array("ac","gDossier","qcode","ag_dest","query","tdoc","date_start","date_end","see_all","all_action")).'&my_action');
//-----------------------------------------------------
// Follow_Up
//-----------------------------------------------------

4
include/class_follow_up.php
View file

@ -671,7 +671,7 @@ class Follow_Up
{
$str_dossier=dossier::get();
// for the sort
$url="?".$str_dossier.'&'.$p_base."&".HtmlInput::get_to_string(array("qcode","ag_dest","query","tdoc","date_start","date_end","see_all","all_action"));
$url=HtmlInput::get_to_string(array("qcode","ag_dest","query","tdoc","date_start","date_end","see_all","all_action")).$str_dossier.'&'.$p_base;
$table=new Sort_Table();
$table->add('Date',$url,'order by ag_timestamp asc','order by ag_timestamp desc','da','dd');
@ -749,7 +749,7 @@ class Follow_Up
//show the sub_action
foreach ($a_row as $row )
{
$href='<A class="document" HREF="do.php?'.$p_base.'&sa=detail&ag_id='.$row['ag_id'].'&'.$str_dossier.'&ac='.$_REQUEST['ac']."&".HtmlInput::get_to_string(array("qcode","ag_dest","query","tdoc","date_start","date_end","see_all","all_action")).'">';
$href='<A class="document" HREF="do.php'.HtmlInput::get_to_string(array("gDossier","qcode","ag_dest","query","tdoc","date_start","date_end","see_all","ac","all_action"))."&".$p_base.'&sa=detail&ag_id='.$row['ag_id'].'">';
$i++;
$tr=($i%2==0)?'even':'odd';
if ($row['ag_priority'] < 2) $tr='priority1';