[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Fmsystem-commits] [6880] Merge 6878:6879 from trunk
|
From: |
Sigurd Nes |
|
Subject: |
[Fmsystem-commits] [6880] Merge 6878:6879 from trunk |
|
Date: |
Mon, 31 Jan 2011 10:21:31 +0000 |
Revision: 6880
http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=6880
Author: sigurdne
Date: 2011-01-31 10:21:30 +0000 (Mon, 31 Jan 2011)
Log Message:
-----------
Merge 6878:6879 from trunk
Modified Paths:
--------------
branches/Version-1_0-branch/property/inc/class.bocommon.inc.php
branches/Version-1_0-branch/property/inc/class.soproject.inc.php
branches/Version-1_0-branch/property/inc/class.soworkorder.inc.php
branches/Version-1_0-branch/property/inc/class.uiworkorder.inc.php
Property Changed:
----------------
branches/Version-1_0-branch/
Property changes on: branches/Version-1_0-branch
___________________________________________________________________
Modified: svn:mergeinfo
-
/trunk:6439-6441,6443,6445-6447,6449-6464,6466-6468,6470-6474,6476-6477,6479-6480,6483-6488,6490-6491,6493-6494,6496-6501,6503-6504,6506,6508,6510-6511,6513,6515-6516,6518,6520-6524,6526-6528,6533-6534,6536-6541,6543-6565,6567,6569,6571-6576,6578,6580-6586,6588-6596,6598-6600,6602-6604,6606-6607,6609-6611,6613-6625,6629-6639,6641-6643,6645-6646,6648,6650-6654,6656-6659,6661-6663,6665-6666,6668-6669,6672-6673,6675,6677-6678,6680,6682-6686,6688-6717,6719,6721-6722,6724-6728,6730,6732-6734,6736-6739,6741,6743,6745-6746,6748-6756,6758-6762,6764,6766-6788,6790,6792-6798,6800-6814,6816-6819,6821-6822,6824-6826,6828-6837,6839,6841,6843-6849,6851,6853-6869,6871-6874,6876-6877
+
/trunk:6439-6441,6443,6445-6447,6449-6464,6466-6468,6470-6474,6476-6477,6479-6480,6483-6488,6490-6491,6493-6494,6496-6501,6503-6504,6506,6508,6510-6511,6513,6515-6516,6518,6520-6524,6526-6528,6533-6534,6536-6541,6543-6565,6567,6569,6571-6576,6578,6580-6586,6588-6596,6598-6600,6602-6604,6606-6607,6609-6611,6613-6625,6629-6639,6641-6643,6645-6646,6648,6650-6654,6656-6659,6661-6663,6665-6666,6668-6669,6672-6673,6675,6677-6678,6680,6682-6686,6688-6717,6719,6721-6722,6724-6728,6730,6732-6734,6736-6739,6741,6743,6745-6746,6748-6756,6758-6762,6764,6766-6788,6790,6792-6798,6800-6814,6816-6819,6821-6822,6824-6826,6828-6837,6839,6841,6843-6849,6851,6853-6869,6871-6874,6876-6877,6879
Modified: branches/Version-1_0-branch/property/inc/class.bocommon.inc.php
===================================================================
--- branches/Version-1_0-branch/property/inc/class.bocommon.inc.php
2011-01-31 10:19:34 UTC (rev 6879)
+++ branches/Version-1_0-branch/property/inc/class.bocommon.inc.php
2011-01-31 10:21:30 UTC (rev 6880)
@@ -1220,11 +1220,12 @@
}
$this->type_id = $type_id;
+/*
for ($i=0; $i<$type_id; $i++)
{
$uicols['input_type'][] = 'text';
- $uicols['name'][] = 'loc' .
$location_types[$i]['id'];
- $uicols['descr'][] =
$location_types[$i]['name'];
+ $uicols['name'][] = 'loc'
. $location_types[$i]['id'];
+ $uicols['descr'][] =
$location_types[$i]['name'];
$uicols['statustext'][] =
$location_types[$i]['descr'];
$uicols['exchange'][] = false;
$uicols['align'][] = '';
@@ -1232,26 +1233,8 @@
$uicols['formatter'][] = '';
$uicols['classname'][] = '';
$uicols['sortable'][] = '';
-
}
-/*
- $fm_location_cols =
$soadmin_location->read_attrib(array('type_id'=>$type_id,'lookup_type'=>$type_id));
- $location_cols_count = count($fm_location_cols);
-
- for ($i=0;$i<$location_cols_count;$i++)
- {
- if($fm_location_cols[$i]['list']==1)
- {
- $cols_extra[]
= $fm_location_cols[$i]['column_name']; // only for lookup
- $cols_return[]
= $fm_location_cols[$i]['column_name'];
- $uicols['input_type'][] =
'text';
- $uicols['name'][]
= $fm_location_cols[$i]['column_name'];
- $uicols['descr'][]
= $fm_location_cols[$i]['input_text'];
- $uicols['statustext'][] =
$fm_location_cols[$i]['statustext'];
- }
- }
-
- */
+*/
unset($soadmin_location);
for ($i=0; $i< $this->type_id; $i++)
@@ -1259,41 +1242,23 @@
$cols_return[] = 'loc' .
$location_types[$i]['id'];
}
-// if($lookup)
+ $GLOBALS['phpgw']->config->read();
+ $list_location_level =
isset($GLOBALS['phpgw']->config->config_data['list_location_level']) &&
$GLOBALS['phpgw']->config->config_data['list_location_level'] ?
$GLOBALS['phpgw']->config->config_data['list_location_level'] : array();
+ for ($i=1;$i<($type_id+1);$i++)
{
- $GLOBALS['phpgw']->config->read();
- $list_location_level =
isset($GLOBALS['phpgw']->config->config_data['list_location_level']) &&
$GLOBALS['phpgw']->config->config_data['list_location_level'] ?
$GLOBALS['phpgw']->config->config_data['list_location_level'] : array();
-/*
- $cols_return[] =
'loc1_name';
- $cols_extra[] =
'loc1_name';
+ $cols_return[] =
"loc{$i}_name";
+ $cols_extra[] =
"loc{$i}_name";
$cols_return_lookup[] =
"loc{$i}_name";
- $uicols['input_type'][] = in_array(1,
$list_location_level) ? 'text' : 'hidden';
- $uicols['name'][] =
'loc1_name';
- $uicols['descr'][] =
$location_types[0]['name'];
- $uicols['statustext'][] =
$location_types[0]['descr'];
+ $uicols['input_type'][] = in_array($i,
$list_location_level) ? 'text' : 'hidden';
+ $uicols['name'][] =
"loc{$i}_name";
+ $uicols['descr'][] =
$location_types[($i-1)]['name'];
+ $uicols['statustext'][] =
$location_types[$i-1]['descr'];
$uicols['exchange'][] = $lookup;
$uicols['align'][] = '';
$uicols['datatype'][] = '';
$uicols['formatter'][] = '';
$uicols['classname'][] = '';
- $uicols['sortable'][] = true;
-*/
- for ($i=1;$i<($type_id+1);$i++)
- {
- $cols_return[]
= "loc{$i}_name";
- $cols_extra[]
= "loc{$i}_name";
- $cols_return_lookup[] =
"loc{$i}_name";
- $uicols['input_type'][] =
in_array($i, $list_location_level) ? 'text' : 'hidden';
- $uicols['name'][]
= "loc{$i}_name";
- $uicols['descr'][]
= $location_types[($i-1)]['name'];
- $uicols['statustext'][] =
$location_types[$i-1]['descr'];
- $uicols['exchange'][] =
$lookup;
- $uicols['align'][]
= '';
- $uicols['datatype'][] = '';
- $uicols['formatter'][] = '';
- $uicols['classname'][] = '';
- $uicols['sortable'][] = '';
- }
+ $uicols['sortable'][] = '';
}
if(!$no_address)
Modified: branches/Version-1_0-branch/property/inc/class.soproject.inc.php
===================================================================
--- branches/Version-1_0-branch/property/inc/class.soproject.inc.php
2011-01-31 10:19:34 UTC (rev 6879)
+++ branches/Version-1_0-branch/property/inc/class.soproject.inc.php
2011-01-31 10:21:30 UTC (rev 6880)
@@ -200,7 +200,8 @@
$uicols['sortable'][] = '';
$cols.= ",loc1_name";
- $cols_return[] =
'loc1_name';
+// $cols_return[] =
'loc1_name';
+/*
$uicols['input_type'][] = 'hidden';
$uicols['name'][] =
'loc1_name';
$uicols['descr'][] =
lang('loc1_name');
@@ -211,7 +212,7 @@
$uicols['formatter'][] = '';
$uicols['classname'][] = '';
$uicols['sortable'][] = '';
-
+*/
$cols.= ",account_lid as coordinator";
$cols_return[] =
'coordinator';
$uicols['input_type'][] = 'text';
Modified: branches/Version-1_0-branch/property/inc/class.soworkorder.inc.php
===================================================================
--- branches/Version-1_0-branch/property/inc/class.soworkorder.inc.php
2011-01-31 10:19:34 UTC (rev 6879)
+++ branches/Version-1_0-branch/property/inc/class.soworkorder.inc.php
2011-01-31 10:21:30 UTC (rev 6880)
@@ -227,7 +227,8 @@
$uicols['sortable'][] = '';
$cols.= ",loc1_name";
- $cols_return[] =
'loc1_name';
+// $cols_return[] =
'loc1_name';
+/*
$uicols['input_type'][] = 'hidden';
$uicols['name'][] =
'loc1_name';
$uicols['descr'][] = '';
@@ -235,7 +236,7 @@
$uicols['formatter'][] = '';
$uicols['classname'][] = '';
$uicols['sortable'][] = '';
-
+*/
$cols .= ",fm_project.user_id as project_owner";
$joinmethod .= " $this->join fm_workorder ON
($entity_table.id = fm_workorder.project_id) $this->join phpgw_accounts ON
(fm_workorder.user_id = phpgw_accounts.account_id))";
Modified: branches/Version-1_0-branch/property/inc/class.uiworkorder.inc.php
===================================================================
--- branches/Version-1_0-branch/property/inc/class.uiworkorder.inc.php
2011-01-31 10:19:34 UTC (rev 6879)
+++ branches/Version-1_0-branch/property/inc/class.uiworkorder.inc.php
2011-01-31 10:21:30 UTC (rev 6880)
@@ -474,8 +474,8 @@
$workorder_list = array();
$workorder_list = $this->bo->read(array('start_date' =>
$start_date, 'end_date' => $end_date, 'allrows' =>$allrows, 'dry_run' =>
$dry_run));
- $uicols = $this->bo->uicols;
-
+ $uicols =$this->bo->uicols;
+//_debug_Array($uicols);die();
$content = array();
$j=0;
if (isset($workorder_list) && is_array($workorder_list))
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Fmsystem-commits] [6880] Merge 6878:6879 from trunk,
Sigurd Nes <=