diff --git a/include/class_fiche.php b/include/class_fiche.php index ff8a6fde9..b1c060dcf 100644 --- a/include/class_fiche.php +++ b/include/class_fiche.php @@ -126,8 +126,8 @@ class Fiche { for ($i=0;$i<$Max;$i++) { $row=Database::fetch_array($Ret,$i); $this->fiche_def=$row['fd_id']; - $t=new Attribut ($this->cn); - $t->ad_id=$row['ad_id']); + $t=new Fiche_Attr ($this->cn); + $t->ad_id=$row['ad_id']; $t->ad_text=$row['ad_text']; $t->av_text=$row['av_text']; $t->ad_type=$row['ad_type']; @@ -1043,6 +1043,7 @@ av_text1=>'name' if ( count($this->row ) == 0 ) return; $qcode=$this->strAttribut(ATTR_DEF_QUICKCODE); + $rep=""; $already_seen=array(); echo '

'.$this->id." ".$name.'

'; @@ -1172,10 +1173,11 @@ av_text1=>'name' HtmlInput::submit('bt_other',"Autre poste"). dossier::hidden(). $hid->input("type","poste").$hid->input('p_action','impress').""; + $str_ople=(isset($_REQUEST['ople']))?HtmlInput::hidden('ople',$_REQUEST['ople']):''; echo '
'. HtmlInput::submit('bt_pdf',"Export PDF"). - dossier::hidden(). + dossier::hidden().$str_ople. $hid->input("type","poste"). $hid->input('p_action','impress'). $hid->input("f_id",$this->id). @@ -1189,7 +1191,7 @@ av_text1=>'name' echo ''. HtmlInput::submit('bt_csv',"Export CSV"). - dossier::hidden(). + dossier::hidden().$str_ople. $hid->input("type","poste"). $hid->input('p_action','impress'). $hid->input("f_id",$this->id). diff --git a/include/class_fiche_attr.php b/include/class_fiche_attr.php index fe89c221c..63e5c5161 100644 --- a/include/class_fiche_attr.php +++ b/include/class_fiche_attr.php @@ -211,12 +211,6 @@ $cn->start(); $cn->rollback(); } - -} -//Fiche_Attr::test_me(); - - - /*! *@brief used with a usort function, to sort an array of Attribut on the attribut_id (ad_id) */ @@ -225,4 +219,10 @@ $cn->rollback(); if ( $o1->ad_id == $o2->ad_id ) return 0; return -1; } + + } +//Fiche_Attr::test_me(); + + + diff --git a/include/class_fiche_def.php b/include/class_fiche_def.php index a241a286e..949cdd788 100644 --- a/include/class_fiche_def.php +++ b/include/class_fiche_def.php @@ -79,7 +79,7 @@ function input () for ($i=0;$i < $Max;$i++) { $row=Database::fetch_array($Ret,$i); $t = new Fiche_Attr($this->cn); - $t->ad_id=$row['ad_id']); + $t->ad_id=$row['ad_id']; $t->ad_text=$row['ad_text']; $t->jnt_order=$row['jnt_order']; $t->ad_size=$row['ad_size'];