Changes:

 

-          Fixed "order" issue with $colnames. You can now specify
column titles in any order without data being in shown in wrong column.

-          If setColumnsName called => display only named columns in
$columns.

Else display all columns with default name (from SQL query).

 

 

 

186c186,187

<                                              $nbcols =
$DB->num_fields($res);

---

>                                              // if empty count select
columns else count $columns

>                                              $nbcols =
(empty($this->columns)) ? $DB->num_fields($res) : count($this->columns);

194,199c195,211

<                              

<                                              for ($i = 0; $i <
$nbcols; $i++) {

<                                                              $colname
= $DB->field_name($res, $i);

<                                                              $coltitle
= (isset ($this->columns[$colname]) ? $this->columns[$colname] :
$colname);

<                                                              echo
displaySearchHeaderItem($output_type, $coltitle, $num);

<
$colsname[] = $colname;

---

>                                              // If setColumnsNames was
set, show only user specified columns

>                                              // else display all
default column titles

>                                              if
(!empty($this->columns)) { 

>                                                              for ($i =
0; $i < $nbcols; $i++) { 

>
$coltitle = current($this->columns);

>
echo displaySearchHeaderItem($output_type, $coltitle, $num);

>
$colsname[] = $coltitle;

>
next($this->columns);

>                                                              }

>                                              }

>                                              // else display all
columns with default select column titles

>                                              else { 

>                                                              for ($i =
0; $i < $nbcols; $i++) {

>
$colname = $DB->field_name($res, $i);

>
echo displaySearchHeaderItem($output_type, $colname, $num);

>
$colsname[] = $colname;

>                                                              }

_______________________________________________
Glpi-dev mailing list
Glpi-dev@gna.org
https://mail.gna.org/listinfo/glpi-dev

Reply via email to