|
| From: | Sigurd Nes |
| Subject: | [Phpgroupware-cvs] property/inc class.uilookup.inc.php class.soloo... |
| Date: | Tue, 31 Oct 2006 18:15:58 +0000 |
CVSROOT: /sources/phpgroupware
Module name: property
Changes by: Sigurd Nes <sigurdne> 06/10/31 18:15:58
Modified files:
inc : class.uilookup.inc.php class.solookup.inc.php
Log message:
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/property/inc/class.uilookup.inc.php?cvsroot=phpgroupware&r1=1.15&r2=1.16
http://cvs.savannah.gnu.org/viewcvs/property/inc/class.solookup.inc.php?cvsroot=phpgroupware&r1=1.10&r2=1.11
Patches:
Index: class.uilookup.inc.php
===================================================================
RCS file: /sources/phpgroupware/property/inc/class.uilookup.inc.php,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -b -r1.15 -r1.16
--- class.uilookup.inc.php 31 Oct 2006 14:14:05 -0000 1.15
+++ class.uilookup.inc.php 31 Oct 2006 18:15:58 -0000 1.16
@@ -8,7 +8,7 @@
* @internal Development of this application was funded by
http://www.bergen.kommune.no/bbb_/ekstern/
* @package property
* @subpackage core
- * @version $Id: class.uilookup.inc.php,v 1.15 2006/10/31 14:14:05
sigurdne Exp $
+ * @version $Id: class.uilookup.inc.php,v 1.16 2006/10/31 18:15:58
sigurdne Exp $
*/
/**
@@ -930,7 +930,8 @@
'var' => 'account_lid',
'order' => $this->order,
'extra' => array('menuaction' =>
$this->currentapp.'.uilookup.phpgw_user',
-
'cat_id'
=>$this->cat_id)
+
'cat_id'
=>$this->cat_id,
+
'column' =>
$column)
)),
'sort_last_name' =>
$this->nextmatchs->show_sort_order(array
(
@@ -938,7 +939,8 @@
'var' => 'account_lastname',
'order' => $this->order,
'extra' => array('menuaction' =>
$this->currentapp.'.uilookup.phpgw_user',
-
'cat_id'
=>$this->cat_id)
+
'cat_id'
=>$this->cat_id,
+
'column' =>
$column)
)),
'sort_first_name' =>
$this->nextmatchs->show_sort_order(array
(
@@ -946,7 +948,8 @@
'var' => 'account_firstname',
'order' => $this->order,
'extra' => array('menuaction' =>
$this->currentapp.'.uilookup.phpgw_user',
-
'cat_id'
=>$this->cat_id)
+
'cat_id'
=>$this->cat_id,
+
'column' =>
$column)
)),
'lang_last_name' => lang('last
name'),
'lang_first_name' => lang('first
name'),
@@ -956,7 +959,8 @@
'var' => 'account_id',
'order' => $this->order,
'extra' => array('menuaction' =>
$this->currentapp.'.uilookup.phpgw_user',
-
'cat_id'
=>$this->cat_id)
+
'cat_id'
=>$this->cat_id,
+
'column' =>
$column)
)),
'lang_id' => lang('ID'),
'lang_select' => lang('Select')
@@ -971,12 +975,12 @@
$link_select = array
(
'menuaction' =>
$this->currentapp.'.uilookup.phpgw_user',
- 'second_display' => true,
'order' => $this->order,
'sort' => $this->sort,
'cat_id' =>
$this->cat_id,
'query' => $this->query,
- 'filter' => $this->filter
+ 'filter' =>
$this->filter,
+ 'column' => $column
);
if($column)
Index: class.solookup.inc.php
===================================================================
RCS file: /sources/phpgroupware/property/inc/class.solookup.inc.php,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -b -r1.10 -r1.11
--- class.solookup.inc.php 31 Oct 2006 14:14:05 -0000 1.10
+++ class.solookup.inc.php 31 Oct 2006 18:15:58 -0000 1.11
@@ -8,7 +8,7 @@
* @internal Development of this application was funded by
http://www.bergen.kommune.no/bbb_/ekstern/
* @package property
* @subpackage core
- * @version $Id: class.solookup.inc.php,v 1.10 2006/10/31 14:14:05
sigurdne Exp $
+ * @version $Id: class.solookup.inc.php,v 1.11 2006/10/31 18:15:58
sigurdne Exp $
*/
/**
@@ -414,7 +414,7 @@
$query = ereg_replace("'",'',$query);
$query = ereg_replace('"','',$query);
- $querymethod = " AND ( account_last_name
$this->like '%$query%' or account_first_name $this->like '%$query%')";
+ $querymethod = " AND ( account_lastname
$this->like '%$query%' or account_firstname $this->like '%$query%')";
}
$sql = "SELECT * FROM phpgw_accounts WHERE
account_status = 'A' AND account_type = 'u' $querymethod ";
| [Prev in Thread] | Current Thread | [Next in Thread] |