diff --git a/html/js/scripts.js b/html/js/scripts.js index fe1d90709..1a1d5fb4d 100644 --- a/html/js/scripts.js +++ b/html/js/scripts.js @@ -1426,7 +1426,6 @@ function result_search_action(obj) try { var queryString=$(obj).serialize()+"&op=search_action"; - alert (queryString); var action = new Ajax.Request( "ajax_misc.php" , {method:'get', diff --git a/include/action.common.inc.php b/include/action.common.inc.php index 9cf1c2ba7..9f5f37130 100644 --- a/include/action.common.inc.php +++ b/include/action.common.inc.php @@ -85,7 +85,7 @@ if ( $sub_action=="update" ) $act2=new Follow_Up($cn); $act2->fromArray($_POST ); $sub_action="detail"; - + put_global(array(array('key'=>"sa","value"=>"detail"))); $act2->Update(); } //---------------------------------------------------------------------- diff --git a/include/ajax_search_action.php b/include/ajax_search_action.php index 1a5a70a69..830af11c1 100755 --- a/include/ajax_search_action.php +++ b/include/ajax_search_action.php @@ -29,7 +29,5 @@ $_REQUEST['ac']='FOLLOW'; echo Follow_Up::display_search($cn,true); $sql= "true ".Follow_Up::create_query($cn); -var_dump($_GET); -echo $sql; echo Follow_Up::short_list($cn, $sql); ?> diff --git a/include/category_followup.inc.php b/include/category_followup.inc.php index e31776bce..b6fe321be 100644 --- a/include/category_followup.inc.php +++ b/include/category_followup.inc.php @@ -37,7 +37,7 @@ require_once('class_follow_up.php'); $sub_action=(isset($_REQUEST['sa']))?$_REQUEST['sa']:"list"; $ag_id=(isset($_REQUEST['ag_id']))?$_REQUEST['ag_id']:0; $p_action=$_REQUEST['ac']; -$base="ac=$p_action&sc=sv&sb=detail&f_id=".$_REQUEST['f_id']."&".HtmlInput::request_to_string(array("qcode","ag_dest","query","tdoc","date_start","date_end","see_all","all_action","sb","sc"),""); +$base="ac=$p_action&sc=sv&sb=detail&f_id=".$_REQUEST['f_id']."&".HtmlInput::request_to_string(array("gDossier","qcode","ag_dest","query","tdoc","date_start","date_end","see_all","all_action","sb","sc"),""); $retour=HtmlInput::button_anchor('Retour','?'.dossier::get().'&'.$base); $fiche=new Fiche($cn,$_REQUEST['f_id']); diff --git a/include/class_follow_up.php b/include/class_follow_up.php index 2c8ed24e2..3b86ec4db 100644 --- a/include/class_follow_up.php +++ b/include/class_follow_up.php @@ -171,8 +171,9 @@ class Follow_Up // List related action $action = $this->db->get_array(" select ag_id,ag_ref,substr(ag_title,1,40) as sub_title,to_char(ag_timestamp,'DD.MM.YY') as str_date , - ag_timestamp + ag_timestamp,dt_value from action_gestion + join document_type on (ag_type=dt_id) where ag_id in (select aga_greatest from action_gestion_related where aga_least =$1) or @@ -1212,7 +1213,7 @@ class Follow_Up $sql = " select ag_id,to_char(ag_timestamp,'DD.MM.YY') as my_date, f_id_dest, - substr(ag_title,1,30) as sub_ag_title,dt_value,ag_ref, ag_priority,ag_state, + substr(ag_title,1,40) as sub_ag_title,dt_value,ag_ref, ag_priority,ag_state, coalesce((select p_name from profile where p_id=ag_dest),'Aucun groupe') as dest, (select ad_value from fiche_Detail where f_id=action_gestion.f_id_dest and ad_id=1) as name from action_gestion diff --git a/include/class_html_input.php b/include/class_html_input.php index f80f117d9..bba6a2d53 100755 --- a/include/class_html_input.php +++ b/include/class_html_input.php @@ -425,7 +425,7 @@ class HtmlInput { $r=''; $r.='
'; - $r.= ''.$action.''; + $r.= ''.$action.''; $r.='
'; return $r; } diff --git a/include/template/detail-action.php b/include/template/detail-action.php index 182e9baf6..622e1d5b0 100644 --- a/include/template/detail-action.php +++ b/include/template/detail-action.php @@ -165,7 +165,7 @@ $showAction=''; $js= 'Effacer'; echo '
  • '.$showAction.$action[$o]['str_date']." ".$action[$o]['ag_ref']." ". - h($action[$o]['sub_title']).''." " + h($action[$o]['sub_title']).'('.h($action[$o]['dt_value']).')'." " .$js.'
  • '; }