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

Remove debug, fix bug with link of related action

Browse source
This commit is contained in:
Dany De Bontridder 2012-06-02 10:55:50 +00:00
parent a69ad3d348
commit 810ca4c6c9
7 changed files with 7 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

1
html/js/scripts.js
View file

@ -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',

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

@ -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();
}
//----------------------------------------------------------------------

2
include/ajax_search_action.php
View file

@ -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);
?>

2
include/category_followup.inc.php
View file

@ -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']);

5
include/class_follow_up.php
View file

@ -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

2
include/class_html_input.php
View file

@ -425,7 +425,7 @@ class HtmlInput
{
$r='';
$r.='<div style="float:right;right;margin:2;">';
$r.= '<A id="close_div" HREF="javascript:void(0)" onclick="'.$javascript.'"">'.$action.'</A>';
$r.= '<A id="close_div" HREF="javascript:void(0)" onclick="'.$javascript.'">'.$action.'</A>';
$r.='</div>';
return $r;
}

2
include/template/detail-action.php
View file

@ -165,7 +165,7 @@
$showAction='<a class="line" href="'.$base."&ag_id=".$action[$o]['ag_id'].'">';
$js= '<a class="mtitle" style="color:orange" id="acact'.$action[$o]['ag_id'].'" href="'.$rmAction.'">Effacer</a>';
echo '<li id="act'.$action[$o]['ag_id'].'">'.$showAction.$action[$o]['str_date']." ".$action[$o]['ag_ref']." ".
h($action[$o]['sub_title']).'</a>'." "
h($action[$o]['sub_title']).'('.h($action[$o]['dt_value']).')</a>'." "
.$js.'</li>';
}