[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Phpgroupware-cvs] CVS: property/inc class.soproperty.inc.php,1.11,1.12
From: |
Sigurd Nes <address@hidden> |
Subject: |
[Phpgroupware-cvs] CVS: property/inc class.soproperty.inc.php,1.11,1.12 class.uiproperty.inc.php,1.12,1.13 |
Date: |
Fri, 04 Apr 2003 05:57:51 -0500 |
Update of /cvsroot/phpgroupware/property/inc
In directory subversions:/tmp/cvs-serv23490/inc
Modified Files:
class.soproperty.inc.php class.uiproperty.inc.php
Log Message:
no message
Index: class.soproperty.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/property/inc/class.soproperty.inc.php,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -r1.11 -r1.12
*** class.soproperty.inc.php 3 Apr 2003 19:12:45 -0000 1.11
--- class.soproperty.inc.php 4 Apr 2003 10:57:48 -0000 1.12
***************
*** 117,124 ****
$query = ereg_replace('"','',$query);
! $querymethod = " AND property_id LIKE
'%$query%' or name LIKE '%$query%'";
}
! $sql = "SELECT * FROM fm_property $this->join
boei_bydel on fm_property.bydel_id = boei_bydel.bydel_id "
. " WHERE $filtermethod $querymethod";
--- 117,124 ----
$query = ereg_replace('"','',$query);
! $querymethod = " AND property_id LIKE
'%$query%' or fm_property.name LIKE '%$query%' or fm_part_of_town.name LIKE
'%$query%'";
}
! $sql = "SELECT fm_property.* , fm_part_of_town.name as
part_of_town, fm_part_of_town.district_id FROM fm_property $this->join
fm_part_of_town on fm_property.part_of_town_id = fm_part_of_town.id "
. " WHERE $filtermethod $querymethod";
***************
*** 134,138 ****
'property_id' =>
(int)$this->db->f('property_id'),
'owner' =>
$this->db->f('owner'),
- 'owner_id' =>
(int)$this->db->f('owner'),
'access' =>
$this->db->f('access'),
'date' =>
$this->db->f('entry_date'),
--- 134,137 ----
***************
*** 140,144 ****
'name' =>
stripslashes($this->db->f('name')),
'district_id' =>
$this->db->f('district_id'),
! 'part_of_town' =>
$this->db->f('bydel'),
'grants' => $ngrants
);
--- 139,143 ----
'name' =>
stripslashes($this->db->f('name')),
'district_id' =>
$this->db->f('district_id'),
! 'part_of_town' =>
$this->db->f('part_of_town'),
'grants' => $ngrants
);
Index: class.uiproperty.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/property/inc/class.uiproperty.inc.php,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -r1.12 -r1.13
*** class.uiproperty.inc.php 27 Feb 2003 19:40:01 -0000 1.12
--- class.uiproperty.inc.php 4 Apr 2003 10:57:48 -0000 1.13
***************
*** 111,115 ****
(
'sort' => $this->sort,
!
'var' => 'navn',
'order' => $this->order,
'extra' => array('menuaction' =>
$this->currentapp.'.uiproperty.index',
--- 111,115 ----
(
'sort' => $this->sort,
!
'var' => 'fm_property.name',
'order' => $this->order,
'extra' => array('menuaction' =>
$this->currentapp.'.uiproperty.index',
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Phpgroupware-cvs] CVS: property/inc class.soproperty.inc.php,1.11,1.12 class.uiproperty.inc.php,1.12,1.13,
Sigurd Nes <address@hidden> <=