[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Fmsystem-commits] [6952] Merge 6950:6951 from trunk
From: |
Sigurd Nes |
Subject: |
[Fmsystem-commits] [6952] Merge 6950:6951 from trunk |
Date: |
Tue, 08 Feb 2011 08:40:44 +0000 |
Revision: 6952
http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=6952
Author: sigurdne
Date: 2011-02-08 08:40:43 +0000 (Tue, 08 Feb 2011)
Log Message:
-----------
Merge 6950:6951 from trunk
Modified Paths:
--------------
branches/Version-1_0-branch/property/inc/class.bocommon.inc.php
branches/Version-1_0-branch/property/inc/class.soentity.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,6879,6881,6883,6885-6886,6888-6893,6895-6897,6899-6901,6903,6905-6907,6909,6911-6929,6931-6936,6938-6947,6949
+
/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,6881,6883,6885-6886,6888-6893,6895-6897,6899-6901,6903,6905-6907,6909,6911-6929,6931-6936,6938-6947,6949,6951
Modified: branches/Version-1_0-branch/property/inc/class.bocommon.inc.php
===================================================================
--- branches/Version-1_0-branch/property/inc/class.bocommon.inc.php
2011-02-07 17:01:47 UTC (rev 6951)
+++ branches/Version-1_0-branch/property/inc/class.bocommon.inc.php
2011-02-08 08:40:43 UTC (rev 6952)
@@ -1175,17 +1175,17 @@
{
//_debug_array($data);
- $cols =
(isset($data['cols'])?$data['cols']:'');
- $entity_table =
(isset($data['entity_table'])?$data['entity_table']:'');
- $cols_return =
(isset($data['cols_return'])?$data['cols_return']:'');
- $uicols =
(isset($data['uicols'])?$data['uicols']:'');
- $joinmethod =
(isset($data['joinmethod'])?$data['joinmethod']:'');
- $paranthesis =
(isset($data['paranthesis'])?$data['paranthesis']:'');
- $lookup =
(isset($data['lookup'])?$data['lookup']:'');
- $location_level =
(isset($data['location_level'])?$data['location_level']:'');
- $no_address =
(isset($data['no_address'])?$data['no_address']:'');
- $uicol_address =
(isset($data['uicol_address'])?$data['uicol_address']:'');
- $force_location =
(isset($data['force_location'])?$data['force_location']:'');
+ $cols =
isset($data['cols'])?$data['cols']:'';
+ $entity_table =
isset($data['entity_table'])?$data['entity_table']:'';
+ $cols_return = isset($data['cols_return'])
&& $data['cols_return'] ? $data['cols_return']:array();
+ $uicols =
isset($data['uicols']) && $data['uicols'] ? $data['uicols']: array();
+ $joinmethod =
isset($data['joinmethod'])?$data['joinmethod']:'';
+ $paranthesis =
isset($data['paranthesis'])?$data['paranthesis']:'';
+ $lookup =
isset($data['lookup'])?$data['lookup']:'';
+ $location_level =
isset($data['location_level'])?$data['location_level']:'';
+ $no_address =
isset($data['no_address'])?$data['no_address']:'';
+ $uicol_address =
isset($data['uicol_address'])?$data['uicol_address']:'';
+ $force_location =
isset($data['force_location'])?$data['force_location']:'';
$cols_extra = array();
$cols_return_lookup = array();
@@ -1220,7 +1220,7 @@
}
$this->type_id = $type_id;
-/*
+
for ($i=0; $i<$type_id; $i++)
{
$uicols['input_type'][] = 'text';
@@ -1232,9 +1232,9 @@
$uicols['datatype'][] = '';
$uicols['formatter'][] = '';
$uicols['classname'][] = '';
- $uicols['sortable'][] = '';
+ $uicols['sortable'][] = $i === 0;
}
-*/
+
unset($soadmin_location);
for ($i=0; $i< $this->type_id; $i++)
Modified: branches/Version-1_0-branch/property/inc/class.soentity.inc.php
===================================================================
--- branches/Version-1_0-branch/property/inc/class.soentity.inc.php
2011-02-07 17:01:47 UTC (rev 6951)
+++ branches/Version-1_0-branch/property/inc/class.soentity.inc.php
2011-02-08 08:40:43 UTC (rev 6952)
@@ -162,6 +162,9 @@
$uicols['align'][] = '';
$uicols['datatype'][] = '';
$uicols['sortable'][] = true;
+ $uicols['exchange'][] = false;
+ $uicols['formatter'][] = '';
+ $uicols['classname'][] = '';
$cols_return[] = 'num';
$uicols['input_type'][] = 'text';
@@ -171,6 +174,9 @@
$uicols['align'][] = '';
$uicols['datatype'][] = '';
$uicols['sortable'][] = true;
+ $uicols['exchange'][] = false;
+ $uicols['formatter'][] = '';
+ $uicols['classname'][] = '';
$cols_return[] = 'id';
$uicols['input_type'][] = 'hidden';
@@ -180,6 +186,9 @@
$uicols['align'][] = '';
$uicols['datatype'][] = '';
$uicols['sortable'][] = false;
+ $uicols['exchange'][] = false;
+ $uicols['formatter'][] = '';
+ $uicols['classname'][] = '';
if($lookup)
{
@@ -192,6 +201,9 @@
$uicols['align'][]
= '';
$uicols['datatype'][] = '';
$uicols['sortable'][] = false;
+ $uicols['exchange'][] = false;
+ $uicols['formatter'][] = '';
+ $uicols['classname'][] = '';
}
$cols .= ", {$entity_table}.user_id";
@@ -203,12 +215,15 @@
$uicols['align'][] = '';
$uicols['datatype'][] = 'user';
$uicols['sortable'][] = false;
+ $uicols['exchange'][] = false;
+ $uicols['formatter'][] = '';
+ $uicols['classname'][] = '';
$cols_return_extra[]= array
- (
- 'name' => 'user_id',
- 'datatype' => 'user'
- );
+ (
+ 'name' => 'user_id',
+ 'datatype' => 'user'
+ );
// Don't work with LDAP - where phpgw_accounts
is empty
// $joinmethod = "
$this->join phpgw_accounts ON ($entity_table.user_id =
phpgw_accounts.account_id))";
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Fmsystem-commits] [6952] Merge 6950:6951 from trunk,
Sigurd Nes <=