[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Phpgroupware-cvs] property/inc class.uientity.inc.php, 1.13 class.uiwor
|
From: |
sigurdne |
|
Subject: |
[Phpgroupware-cvs] property/inc class.uientity.inc.php, 1.13 class.uiworkorder.inc.php, 1.14 class.uitenant_claim.inc.php, 1.8 class.uiagreement.inc.php, 1.15 class.boentity.inc.php, 1.8 class.uitts.inc.php, 1.21 class.uidocument.inc.php, 1.10 class.uipricebook.inc.php, 1.12 class.uirequest.inc.php, 1.16 class.uiproject.inc.php, 1.20 class.botts.inc.php, 1.10 |
|
Date: |
Tue, 8 Nov 2005 23:39:00 +0100 |
Update of property/inc
Modified Files:
Branch: MAIN
class.uientity.inc.php lines: +19 -7
class.uiworkorder.inc.php lines: +2 -2
class.uitenant_claim.inc.php lines: +2 -2
class.uiagreement.inc.php lines: +2 -2
class.boentity.inc.php lines: +10 -10
class.uitts.inc.php lines: +3 -3
class.uidocument.inc.php lines: +3 -3
class.uipricebook.inc.php lines: +2 -2
class.uirequest.inc.php lines: +2 -2
class.uiproject.inc.php lines: +2 -2
class.botts.inc.php lines: +7 -2
Log Message:
no message
====================================================
Index: property/inc/class.uientity.inc.php
diff -u property/inc/class.uientity.inc.php:1.12
property/inc/class.uientity.inc.php:1.13
--- property/inc/class.uientity.inc.php:1.12 Wed Aug 10 19:39:43 2005
+++ property/inc/class.uientity.inc.php Tue Nov 8 22:39:10 2005
@@ -258,8 +258,7 @@
$GLOBALS['phpgw']->xslttpl->add_file(array('entity',
'menu',
-
'nextmatchs',
-
'search_field'));
+
'nextmatchs'));
$links = $this->menu->links();
@@ -418,8 +417,21 @@
$link_date_search
=
$GLOBALS['phpgw']->link('/index.php','menuaction='.$this->currentapp.'.uiproject.date_search');
+ $group_filters =
$GLOBALS['phpgw_info']['user']['preferences'][$this->currentapp]['group_filters']?
'select':'filter';
+
if($GLOBALS['phpgw_info']['user']['preferences'][$this->currentapp]['group_filters'])
+ {
+ $group_filters = 'select';
+
$GLOBALS['phpgw']->xslttpl->add_file(array('search_field_grouped'));
+ }
+ else
+ {
+ $group_filters = 'filter';
+
$GLOBALS['phpgw']->xslttpl->add_file(array('search_field'));
+ }
+
$data = array
(
+ 'group_filters' =>
$GLOBALS['phpgw_info']['user']['preferences'][$this->currentapp]['group_filters'],
'lang_excel' =>
'excel',
'link_excel' =>
$GLOBALS['phpgw']->link('/index.php',$link_excel),
'lang_excel_help' =>
lang('Download table to MS Excel'),
@@ -447,7 +459,7 @@
'link_url'
=> $GLOBALS['phpgw']->link('/index.php',$link_data),
'img_path'
=> $GLOBALS['phpgw']->common->get_image_path('phpgwapi','default'),
- 'district_list'
=> $this->bocommon->select_district_list('filter',$this->district_id),
+ 'district_list'
=> $this->bocommon->select_district_list($group_filters,$this->district_id),
'lang_no_district'
=> lang('no district'),
'lang_district_statustext' =>
lang('Select the district the selection belongs to. To do not use a district
select NO DISTRICT'),
'select_district_name' =>
'district_id',
@@ -456,17 +468,17 @@
'lang_no_cat'
=> lang('no category'),
'lang_cat_statustext' =>
lang('Select the category. To do not use a category select NO CATEGORY'),
'select_name'
=> 'cat_id',
- 'cat_list'
=> $this->bo->select_category_list('filter',$this->cat_id),
+ 'cat_list'
=> $this->bo->select_category_list($group_filters,$this->cat_id),
'lang_status_statustext' =>
lang('Select the status. To do not use a status select NO STATUS'),
'status_name'
=> 'status',
'lang_no_status'
=> lang('No status'),
- 'status_list'
=> $this->bo->select_status_list('filter',$this->status),
+ 'status_list'
=> $this->bo->select_status_list($group_filters,$this->status),
'lang_user_statustext' =>
lang('Select the user. To do not use a category select NO USER'),
'select_user_name'
=> 'filter',
'lang_no_user'
=> lang('No user'),
- 'user_list'
=>
$this->bocommon->get_user_list_right2('filter',4,$this->filter,$this->acl2_location,array('all'),$default='all'),
+ 'user_list'
=>
$this->bocommon->get_user_list_right2($group_filters,4,$this->filter,$this->acl2_location,array('all'),$default='all'),
'lang_filter_statustext' =>
lang('Select the filter. 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/class.uiworkorder.inc.php
diff -u property/inc/class.uiworkorder.inc.php:1.13
property/inc/class.uiworkorder.inc.php:1.14
--- property/inc/class.uiworkorder.inc.php:1.13 Tue Sep 13 11:38:04 2005
+++ property/inc/class.uiworkorder.inc.php Tue Nov 8 22:39:10 2005
@@ -863,7 +863,7 @@
'user_list'
=>
$this->bocommon->get_user_list('select',$project['coordinator'],$extra=False,$default=False,$start=-1,$sort=False,$order=False,$query='',$offset=-1),
'status_list'
=> $this->bo->select_status_list('select',$values['status']),
- 'select_status_name' =>
'values[status]',
+ 'status_name'
=> 'values[status]',
'lang_no_status'
=> lang('Select status'),
'lang_status'
=> lang('Status'),
'lang_status_statustext' =>
lang('What is the current status of this workorder ?'),
====================================================
Index: property/inc/class.uitenant_claim.inc.php
diff -u property/inc/class.uitenant_claim.inc.php:1.7
property/inc/class.uitenant_claim.inc.php:1.8
--- property/inc/class.uitenant_claim.inc.php:1.7 Thu May 12 21:26:28 2005
+++ property/inc/class.uitenant_claim.inc.php Tue Nov 8 22:39:10 2005
@@ -545,7 +545,7 @@
'lang_status_statustext' =>
lang('Select status'),
'status_list'
=> $this->bo->get_status_list(array('format' => 'select', 'selected' =>
$values['status'],'default' => 'open')),
'lang_no_status'
=> lang('No status'),
- 'select_status_name' =>
'values[status]',
+ 'status_name'
=> 'values[status]',
'lang_amount'
=> lang('amount'),
'lang_amount_statustext' =>
lang('The total amount to claim'),
====================================================
Index: property/inc/class.uiagreement.inc.php
diff -u property/inc/class.uiagreement.inc.php:1.14
property/inc/class.uiagreement.inc.php:1.15
--- property/inc/class.uiagreement.inc.php:1.14 Mon Nov 7 10:17:47 2005
+++ property/inc/class.uiagreement.inc.php Tue Nov 8 22:39:10 2005
@@ -1048,7 +1048,7 @@
'lang_status'
=> lang('Status'),
'status_list'
=> $this->bo->select_status_list('select',$agreement['status']),
- 'select_status_name' =>
'values[status]',
+ 'status_name'
=> 'values[status]',
'lang_no_status'
=> lang('Select status'),
);
====================================================
Index: property/inc/class.boentity.inc.php
diff -u property/inc/class.boentity.inc.php:1.7
property/inc/class.boentity.inc.php:1.8
--- property/inc/class.boentity.inc.php:1.7 Mon Oct 24 10:43:29 2005
+++ property/inc/class.boentity.inc.php Tue Nov 8 22:39:10 2005
@@ -92,35 +92,35 @@
$this->start=0;
}
- if(isset($query))
+ if($query)
{
$this->query = $query;
}
- if(isset($filter))
+ if($filter)
{
$this->filter = $filter;
}
- if(isset($sort))
+ if($sort)
{
$this->sort = $sort;
}
- if(isset($order))
+ if($order)
{
$this->order = $order;
}
- if(isset($cat_id))
+ if($cat_id)
{
$this->cat_id = $cat_id;
}
- if(isset($district_id))
+ if($district_id)
{
$this->district_id = $district_id;
}
- if(isset($entity_id))
+ if($entity_id)
{
$this->entity_id = $entity_id;
}
- if(isset($status))
+ if($status)
{
$this->status = $status;
}
@@ -612,7 +612,7 @@
if (is_file(PHPGW_APP_INC . SEP .
'custom' . SEP . $entry['file_name']) && $entry['active'])
include (PHPGW_APP_INC . SEP . 'custom'
. SEP . $entry['file_name']);
}
-
+
}
return receipt;
}
====================================================
Index: property/inc/class.uitts.inc.php
diff -u property/inc/class.uitts.inc.php:1.20
property/inc/class.uitts.inc.php:1.21
--- property/inc/class.uitts.inc.php:1.20 Tue Nov 8 15:19:36 2005
+++ property/inc/class.uitts.inc.php Tue Nov 8 22:39:10 2005
@@ -182,7 +182,6 @@
$start_date =
urldecode(get_var('start_date',array('POST','GET')));
$end_date =
urldecode(get_var('end_date',array('POST','GET')));
-
if ($default_category && !$second_display &&
!$this->district_id)
{
$this->bo->district_id = $default_category;
@@ -492,6 +491,7 @@
$data = array
(
+ 'lang_reset_query' =>
lang('check to reset the query'),
'group_filters' =>
$GLOBALS['phpgw_info']['user']['preferences'][$this->currentapp]['group_filters'],
'lang_excel' =>
'excel',
'link_excel' =>
$GLOBALS['phpgw']->link('/index.php',$link_excel),
@@ -1032,7 +1032,7 @@
'table_header_additional_notes' =>
$table_header_additional_notes,
'table_header_history' =>
$table_header_history,
'lang_status'
=> lang('Status'),
- 'select_status_name' =>
'values[status]',
+ 'status_name'
=> 'values[status]',
'status_list'
=> $this->bo->get_status_list($ticket['status']),
'lang_status_statustext' =>
lang('Set the status of the ticket'),
====================================================
Index: property/inc/class.uidocument.inc.php
diff -u property/inc/class.uidocument.inc.php:1.9
property/inc/class.uidocument.inc.php:1.10
--- property/inc/class.uidocument.inc.php:1.9 Wed Aug 10 19:39:43 2005
+++ property/inc/class.uidocument.inc.php Tue Nov 8 22:39:10 2005
@@ -982,7 +982,7 @@
'user_list'
=>
$this->bocommon->get_user_list_right2('select',4,$values['coordinator'],$this->acl2_location),
'status_list'
=> $this->bo->select_status_list('select',$values['status']),
- 'select_status_name' =>
'values[status]',
+ 'status_name' =>
'values[status]',
'lang_no_status'
=> lang('Select status'),
'lang_status'
=> lang('Status'),
'lang_status_statustext' =>
lang('What is the current status of this document ?'),
@@ -1166,7 +1166,7 @@
'user_list'
=>
$this->bocommon->get_user_list('select',$values['coordinator'],$extra=False,$default=False,$start=-1,$sort='ASC',$order='account_lastname',$query='',$offset=-1),
'status_list'
=> $this->bo->select_status_list('select',$values['status']),
- 'select_status_name' =>
'values[status]',
+ 'status_name'
=> 'values[status]',
'lang_no_status'
=> lang('Select status'),
'lang_status'
=> lang('Status'),
'lang_status_statustext' =>
lang('What is the current status of this document ?'),
====================================================
Index: property/inc/class.uipricebook.inc.php
diff -u property/inc/class.uipricebook.inc.php:1.11
property/inc/class.uipricebook.inc.php:1.12
--- property/inc/class.uipricebook.inc.php:1.11 Thu May 12 21:26:28 2005
+++ property/inc/class.uipricebook.inc.php Tue Nov 8 22:39:10 2005
@@ -541,7 +541,7 @@
'lang_num'
=> lang('Agreement group code'),
'lang_status'
=> lang('Status'),
'status_list'
=> $this->bo->select_status_list('select',$values['status']),
- 'select_status_name' =>
'values[status]',
+ 'status_name'
=> 'values[status]',
'lang_no_status'
=> lang('Select status'),
'lang_save'
=> lang('save'),
====================================================
Index: property/inc/class.uirequest.inc.php
diff -u property/inc/class.uirequest.inc.php:1.15
property/inc/class.uirequest.inc.php:1.16
--- property/inc/class.uirequest.inc.php:1.15 Wed Sep 21 14:18:20 2005
+++ property/inc/class.uirequest.inc.php Tue Nov 8 22:39:10 2005
@@ -923,7 +923,7 @@
'user_list'
=>
$this->bocommon->get_user_list_right2('select',4,$values['coordinator'],$this->acl2_location),
'status_list'
=> $this->boproject->select_status_list('select',$values['status']),
- 'select_status_name' =>
'values[status]',
+ 'status_name'
=> 'values[status]',
'lang_no_status'
=> lang('Select status'),
'lang_status'
=> lang('Status'),
'lang_status_statustext' =>
lang('What is the current status of this request ?'),
====================================================
Index: property/inc/class.uiproject.inc.php
diff -u property/inc/class.uiproject.inc.php:1.19
property/inc/class.uiproject.inc.php:1.20
--- property/inc/class.uiproject.inc.php:1.19 Mon Sep 12 08:19:02 2005
+++ property/inc/class.uiproject.inc.php Tue Nov 8 22:39:10 2005
@@ -1084,7 +1084,7 @@
'user_list'
=>
$this->bocommon->get_user_list_right2('select',4,$values['coordinator'],$this->acl2_location),
'status_list'
=> $this->bo->select_status_list('select',$values['status']),
- 'select_status_name' =>
'values[status]',
+ 'status_name'
=> 'values[status]',
'lang_no_status'
=> lang('Select status'),
'lang_status'
=> lang('Status'),
'lang_status_statustext' =>
lang('What is the current status of this project ?'),
====================================================
Index: property/inc/class.botts.inc.php
diff -u property/inc/class.botts.inc.php:1.9
property/inc/class.botts.inc.php:1.10
--- property/inc/class.botts.inc.php:1.9 Tue Nov 8 15:19:36 2005
+++ property/inc/class.botts.inc.php Tue Nov 8 22:39:10 2005
@@ -65,8 +65,13 @@
if ($session)
{
- $this->read_sessiondata();
+ $reset_query =
get_var('reset_query',array('POST','GET'));
+ if(!$reset_query)
+ {
+ $this->read_sessiondata();
+ }
$this->use_session = True;
+
}
$start = get_var('start',array('POST','GET'));
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Phpgroupware-cvs] property/inc class.uientity.inc.php, 1.13 class.uiworkorder.inc.php, 1.14 class.uitenant_claim.inc.php, 1.8 class.uiagreement.inc.php, 1.15 class.boentity.inc.php, 1.8 class.uitts.inc.php, 1.21 class.uidocument.inc.php, 1.10 class.uipricebook.inc.php, 1.12 class.uirequest.inc.php, 1.16 class.uiproject.inc.php, 1.20 class.botts.inc.php, 1.10,
sigurdne <=