[0004216] Print Work Orders: database error fixed when voided WO is in selected range.

[fa-stable.git] / includes / ui / db_pager_view.inc

diff --git a/includes/ui/db_pager_view.inc b/includes/ui/db_pager_view.inc
index d941cf9056af0bec273a33d2ae79a5472a5b43c4..8245d77b4cc2eb0df5fcc7c500def48b60bec68f 100644 (file)
--- a/includes/ui/db_pager_view.inc
+++ b/includes/ui/db_pager_view.inc
@@ -40,7 +40,7 @@ function navi_button_cell($name, $value, $enabled=true, $align='left') {
 //    Sql paged table view. Call this function inside form.
 //
 function display_db_pager(&$pager) {
-    global     $table_style, $use_popup_windows, $use_date_picker, $path_to_root;
+    global     $path_to_root;
 
        $pager->select_records();
 
@@ -61,7 +61,7 @@ function display_db_pager(&$pager) {
                }
        }
     /* show a table of records returned by the sql */
-    start_table("$table_style width=$pager->width");
+    start_table(TABLESTYLE, "width='$pager->width'");
     table_header($headers);
 
        if($pager->header_fun) {        // if set header handler
@@ -83,6 +83,13 @@ function display_db_pager(&$pager) {
        $cc = 0; //row colour counter
        foreach($pager->data as $line_no => $row) {     
 
+        if ($pager->row_fun) {
+            if (function_exists($pager->row_fun)) {
+                $fn = $pager->row_fun;
+                $row = $fn($row);
+            }
+        }
+
                $marker = $pager->marker;
            if ($marker && $marker($row)) 
                start_row("class='$pager->marker_class'");
@@ -103,7 +110,7 @@ function display_db_pager(&$pager) {
                   }
                   switch($coltype) { // format column
                    case 'time':
-                         label_cell($cell, "width=40"); break;
+                         label_cell($cell, "width='40'"); break;
                    case 'date':
                          label_cell(sql2date($cell), "align='center' nowrap"); break;
                    case 'dstamp':      // time stamp displayed as date
@@ -132,7 +139,6 @@ function display_db_pager(&$pager) {
                                if(get_post('show_inactive'))
                                        $pager->inactive_control_cell($row); break;
                    default:
-//                 case 'text':
                          if (isset( $col['align']))
                                  label_cell($cell, "align='" . $col['align'] . "'");
                          else
@@ -188,7 +194,7 @@ function display_db_pager(&$pager) {
                echo $inact;
                echo "</td>";
        } else {
-         label_cell( _('No records') . $inact, "colspan=$colspan class='navibar'");
+               label_cell( _('No records') . $inact, "colspan=$colspan class='navibar'");
        }
 
        end_row();
@@ -203,4 +209,3 @@ function display_db_pager(&$pager) {
 }
 
 
-?>
\ No newline at end of file