[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Phpgroupware-cvs] property/inc class.uilocation.inc.php class.sol...
|
From: |
Sigurd Nes |
|
Subject: |
[Phpgroupware-cvs] property/inc class.uilocation.inc.php class.sol... |
|
Date: |
Fri, 03 Mar 2006 09:13:42 +0000 |
CVSROOT: /sources/phpgroupware
Module name: property
Branch:
Changes by: Sigurd Nes <address@hidden> 06/03/03 09:13:42
Modified files:
inc : class.uilocation.inc.php
class.solocation.inc.php
class.bolocation.inc.php hook_settings.inc.php
Log message:
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/phpgroupware/property/inc/class.uilocation.inc.php.diff?tr1=1.20&tr2=1.21&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/phpgroupware/property/inc/class.solocation.inc.php.diff?tr1=1.23&tr2=1.24&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/phpgroupware/property/inc/class.bolocation.inc.php.diff?tr1=1.11&tr2=1.12&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/phpgroupware/property/inc/hook_settings.inc.php.diff?tr1=1.13&tr2=1.14&r1=text&r2=text
Patches:
Index: property/inc/class.bolocation.inc.php
diff -u property/inc/class.bolocation.inc.php:1.11
property/inc/class.bolocation.inc.php:1.12
--- property/inc/class.bolocation.inc.php:1.11 Wed Mar 1 12:27:15 2006
+++ property/inc/class.bolocation.inc.php Fri Mar 3 09:13:42 2006
@@ -8,7 +8,7 @@
* @internal Development of this application was funded by
http://www.bergen.kommune.no/bbb_/ekstern/
* @package property
* @subpackage location
- * @version $Id: class.bolocation.inc.php,v 1.11 2006/03/01 12:27:15
sigurdne Exp $
+ * @version $Id: class.bolocation.inc.php,v 1.12 2006/03/03 09:13:42
sigurdne Exp $
*/
/**
@@ -184,10 +184,10 @@
switch($format)
{
case 'select':
-
$GLOBALS['phpgw']->xslttpl->add_file(array('filter_select'));
+
$GLOBALS['phpgw']->xslttpl->add_file(array('owner_select'));
break;
case 'filter':
-
$GLOBALS['phpgw']->xslttpl->add_file(array('filter_filter'));
+
$GLOBALS['phpgw']->xslttpl->add_file(array('owner_filter'));
break;
}
Index: property/inc/class.solocation.inc.php
diff -u property/inc/class.solocation.inc.php:1.23
property/inc/class.solocation.inc.php:1.24
--- property/inc/class.solocation.inc.php:1.23 Thu Mar 2 15:48:41 2006
+++ property/inc/class.solocation.inc.php Fri Mar 3 09:13:42 2006
@@ -8,7 +8,7 @@
* @internal Development of this application was funded by
http://www.bergen.kommune.no/bbb_/ekstern/
* @package property
* @subpackage location
- * @version $Id: class.solocation.inc.php,v 1.23 2006/03/02 15:48:41
sigurdne Exp $
+ * @version $Id: class.solocation.inc.php,v 1.24 2006/03/03 09:13:42
sigurdne Exp $
*/
/**
@@ -444,7 +444,14 @@
if ($filter > 0)
{
- $filtermethod .= " $where
fm_owner.category='$filter' ";
+
if($GLOBALS['phpgw_info']['user']['preferences'][$this->currentapp]['property_filter']
== 'owner')
+ {
+ $filtermethod .= " $where
fm_owner.id='$filter' ";
+ }
+ else
+ {
+ $filtermethod .= " $where
fm_owner.category='$filter' ";
+ }
$where= 'AND';
}
Index: property/inc/class.uilocation.inc.php
diff -u property/inc/class.uilocation.inc.php:1.20
property/inc/class.uilocation.inc.php:1.21
--- property/inc/class.uilocation.inc.php:1.20 Thu Mar 2 15:48:41 2006
+++ property/inc/class.uilocation.inc.php Fri Mar 3 09:13:42 2006
@@ -8,7 +8,7 @@
* @internal Development of this application was funded by
http://www.bergen.kommune.no/bbb_/ekstern/
* @package property
* @subpackage location
- * @version $Id: class.uilocation.inc.php,v 1.20 2006/03/02 15:48:41
sigurdne Exp $
+ * @version $Id: class.uilocation.inc.php,v 1.21 2006/03/03 09:13:42
sigurdne Exp $
*/
/**
@@ -360,9 +360,20 @@
$record_limit = $this->bo->total_records;
}
+
if($GLOBALS['phpgw_info']['user']['preferences'][$this->currentapp]['property_filter']
== 'owner')
+ {
+ $owner_list =
$this->bo->get_owner_list('filter', $this->filter);
+ }
+ else
+ {
+ $owner_list =
$this->bo->get_owner_type_list('filter', $this->filter);
+ }
+
+//_debug_array($owner_list);
$data = array
(
+ 'colspan' =>
$uicols_count,
'lang_excel' =>
'excel',
'link_excel' =>
$GLOBALS['phpgw']->link('/index.php',$link_excel),
'lang_excel_help' =>
lang('Download table to MS Excel'),
@@ -403,7 +414,7 @@
'cat_list'
=> $this->bo->select_category_list('filter',$this->cat_id,$type_id),
'select_action'
=> $GLOBALS['phpgw']->link('/index.php',$link_data),
'owner_name'
=> 'filter',
- 'owner_list'
=> $this->bo->get_owner_type_list('filter', $this->filter),
+ 'owner_list'
=> $owner_list,
'lang_show_all'
=> lang('Show all'),
'lang_owner_statustext' =>
lang('Select the owner type. To show all entries select SHOW ALL'),
'lang_searchfield_statustext' => lang('Enter
the search string. To show all entries, empty this field and press the SUBMIT
button again'),
Index: property/inc/hook_settings.inc.php
diff -u property/inc/hook_settings.inc.php:1.13
property/inc/hook_settings.inc.php:1.14
--- property/inc/hook_settings.inc.php:1.13 Fri Feb 3 12:05:49 2006
+++ property/inc/hook_settings.inc.php Fri Mar 3 09:13:42 2006
@@ -8,11 +8,18 @@
* @internal Development of this application was funded by
http://www.bergen.kommune.no/bbb_/ekstern/
* @package property
* @subpackage core
- * @version $Id: hook_settings.inc.php,v 1.13 2006/02/03 12:05:49
sigurdne Exp $
+ * @version $Id: hook_settings.inc.php,v 1.14 2006/03/03 09:13:42
sigurdne Exp $
*/
$this->currentapp =
$GLOBALS['phpgw_info']['flags']['currentapp'];
+ $select_property_filter = array(
+ '' => lang('Owner type'),
+ 'owner' => lang('Owner')
+
+ );
+ create_select_box('Choose property
filter','property_filter',$select_property_filter,'Filter by owner or owner
type');
+
$yes_and_no = array(
'True' => 'Yes',
'' => 'No'