[Fmsystem-commits] [8950] property: custom fields

[Sigurd Nes]

Revision: 8950
          http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=8950
Author:   sigurdne
Date:     2012-02-24 08:03:18 +0000 (Fri, 24 Feb 2012)
Log Message:
-----------
property: custom fields

Modified Paths:
--------------
    trunk/property/inc/class.boproject.inc.php
    trunk/property/inc/class.uiwo_hour.inc.php

Modified: trunk/property/inc/class.boproject.inc.php
===================================================================
--- trunk/property/inc/class.boproject.inc.php  2012-02-24 07:35:50 UTC (rev 
8949)
+++ trunk/property/inc/class.boproject.inc.php  2012-02-24 08:03:18 UTC (rev 
8950)
@@ -153,7 +153,9 @@
                        {
                                $selected = 
isset($GLOBALS['phpgw_info']['user']['preferences']['property']['project_columns'])
 ? $GLOBALS['phpgw_info']['user']['preferences']['property']['project_columns'] 
: '';
                        }
-                       $columns        = $this->get_column_list();
+                       $filter = array('list' => ''); // translates to "list 
IS NULL"
+                       $columns = $this->custom->find('property','.project', 
0, '','','',true, false, $filter);
+                       $columns = array_merge( $columns, 
$this->get_column_list() );
                        return 
$this->bocommon->select_multi_list($selected,$columns);
                }
 
@@ -417,16 +419,19 @@
 
                        foreach ($custom_cols as $col_id)
                        {
-                               $this->uicols['input_type'][]   = 'text';
-                               $this->uicols['name'][]                 = 
$col_id;
-                               $this->uicols['descr'][]                = 
$column_list[$col_id]['name'];
-                               $this->uicols['statustext'][]   = 
$column_list[$col_id]['name'];
-                               $this->uicols['exchange'][]             = false;
-                               $this->uicols['align'][]                = '';
-                               $this->uicols['datatype'][]             = false;
-                               $this->uicols['sortable'][]             = 
$column_list[$col_id]['sortable'];
-                               $this->uicols['formatter'][]    = 
$column_list[$col_id]['formatter'];
-                               $this->uicols['classname'][]    = 
$column_list[$col_id]['classname'];
+                               if(!ctype_digit($col_id))
+                               {
+                                       $this->uicols['input_type'][]   = 
'text';
+                                       $this->uicols['name'][]                 
= $col_id;
+                                       $this->uicols['descr'][]                
= $column_list[$col_id]['name'];
+                                       $this->uicols['statustext'][]   = 
$column_list[$col_id]['name'];
+                                       $this->uicols['exchange'][]             
= false;
+                                       $this->uicols['align'][]                
= '';
+                                       $this->uicols['datatype'][]             
= false;
+                                       $this->uicols['sortable'][]             
= $column_list[$col_id]['sortable'];
+                                       $this->uicols['formatter'][]    = 
$column_list[$col_id]['formatter'];
+                                       $this->uicols['classname'][]    = 
$column_list[$col_id]['classname'];
+                               }
                        }
 
                        if(!isset($data['skip_origin']) || 
!$data['skip_origin'])
@@ -438,6 +443,9 @@
                                $this->uicols['exchange'][]             = false;
                                $this->uicols['align'][]                = '';
                                $this->uicols['datatype'][]             = 
'link';
+                               $this->uicols['sortable'][]             = '';
+                               $this->uicols['formatter'][]    = '';
+                               $this->uicols['classname'][]    = '';
                        }
 
                        $cols_extra             = $this->so->cols_extra;

Modified: trunk/property/inc/class.uiwo_hour.inc.php
===================================================================
--- trunk/property/inc/class.uiwo_hour.inc.php  2012-02-24 07:35:50 UTC (rev 
8949)
+++ trunk/property/inc/class.uiwo_hour.inc.php  2012-02-24 08:03:18 UTC (rev 
8950)
@@ -1223,7 +1223,7 @@
                        {
                                $values_hour = $common_data['content'];
                        }
-                       $project        = 
$this->boproject->read_single($common_data['workorder']['project_id']);
+                       $project        = 
$this->boproject->read_single($common_data['workorder']['project_id'],array(),true);
 
                        $bolocation     = CreateObject('property.bolocation');
 
@@ -1864,11 +1864,10 @@
                        $preview = phpgw::get_var('preview', 'bool');
 
                        $common_data            = 
$this->common_data($workorder_id);
-                       $project                        = 
$this->boproject->read_single($common_data['workorder']['project_id']);
+                       $project                        = 
$this->boproject->read_single($common_data['workorder']['project_id'],array(),true);
 
                        $content = 
$this->_get_order_details($common_data['content'],   $show_cost);
 
-
                        $dateformat = 
$GLOBALS['phpgw_info']['user']['preferences']['common']['dateformat'];
                        $date = 
$GLOBALS['phpgw']->common->show_date(time(),$dateformat);