|
| From: | nomail |
| Subject: | [Phpgroupware-cvs] property/inc/class.uitts.inc.php, 1.1.1.2 |
| Date: | Thu, 13 May 2004 20:08:03 +0200 |
Update of /property/inc
Modified Files:
Branch:
class.uitts.inc.php
date: 2004/05/13 18:08:03; author: sigurdne; state: Exp; lines: +30 -4
Log Message:
no message
=====================================================================
Index: property/inc/class.uitts.inc.php
diff -u property/inc/class.uitts.inc.php:1.1.1.1
property/inc/class.uitts.inc.php:1.1.1.2
--- property/inc/class.uitts.inc.php:1.1.1.1 Fri Apr 23 13:14:10 2004
+++ property/inc/class.uitts.inc.php Thu May 13 18:08:03 2004
@@ -28,6 +28,7 @@
function uitts()
{
+ $this->account =
$GLOBALS['phpgw_info']['user']['account_id'];
$GLOBALS['phpgw_info']['flags']['xslt_app'] = True;
$this->currentapp =
$GLOBALS['phpgw_info']['flags']['currentapp'];
$this->nextmatchs =
CreateObject('phpgwapi.nextmatchs');
@@ -49,6 +50,7 @@
$this->sort =
$this->bo->sort;
$this->order =
$this->bo->order;
$this->filter =
$this->bo->filter;
+ $this->user_filter =
$this->bo->user_filter;
$this->cat_id =
$this->bo->cat_id;
$this->district_id =
$this->bo->district_id;
$this->allrows =
$this->bo->allrows;
@@ -65,6 +67,7 @@
'sort' => $this->sort,
'order' => $this->order,
'filter' => $this->filter,
+ 'user_filter'=> $this->user_filter,
'cat_id' => $this->cat_id,
'district_id' => $this->district_id,
'allrows' => $this->allrows
@@ -187,13 +190,21 @@
//_debug_array($ticket_list);
while (is_array($ticket_list) && list(,$ticket) =
each($ticket_list))
{
+ if($ticket['subject'])
+ {
+ $first= $ticket['subject'];
+ }
+ else
+ {
+ $first= $ticket['category'];
+ }
$content[] = array
(
'id'
=> $ticket['id'],
'bgcolor'
=> $bgcolor[$ticket['priority']],
'new_ticket'
=> $ticket['new_ticket'],
'priostr'
=> str_repeat("||", $ticket['priority']),
- 'first'
=> $ticket['category'],
+ 'first'
=> $first,
'location_code'
=> $ticket['location_code'],
'address'
=> $ticket['address'],
'date'
=> $ticket['timestampopened'],
@@ -218,6 +229,7 @@
'extra' => array('menuaction' =>
$this->currentapp.'.uitts.index',
'cat_id'
=>$this->cat_id,
'filter'
=>$this->filter,
+
'user_filter'
=>$this->user_filter,
'district_id' =>
$this->district_id,
'query'
=>$this->query,
'second_display'
=> true,
@@ -235,6 +247,7 @@
'extra' => array('menuaction' =>
$this->currentapp.'.uitts.index',
'cat_id'
=>$this->cat_id,
'filter'
=>$this->filter,
+
'user_filter'
=>$this->user_filter,
'district_id' =>
$this->district_id,
'query'
=>$this->query,
'second_display'
=> true,
@@ -244,7 +257,7 @@
'lang_id' => lang('ID'),
'lang_id_statustext' => lang('Sort
the tickets by their ID'),
- 'lang_subject' =>
lang('Category'),
+ 'lang_subject' =>
lang('Subject'),
'lang_time_created' => lang('Started'),
'lang_view' => lang('view'),
'lang_location_code' => lang('Location'),
@@ -258,6 +271,7 @@
'extra' => array('menuaction' =>
$this->currentapp.'.uitts.index',
'cat_id'
=>$this->cat_id,
'filter'
=>$this->filter,
+
'user_filter'
=>$this->user_filter,
'district_id' =>
$this->district_id,
'query'
=>$this->query,
'second_display'
=> true,
@@ -272,6 +286,7 @@
'extra' => array('menuaction' =>
$this->currentapp.'.uitts.index',
'cat_id'
=>$this->cat_id,
'filter'
=>$this->filter,
+
'user_filter'
=>$this->user_filter,
'district_id' =>
$this->district_id,
'query'
=>$this->query,
'second_display'
=> true,
@@ -285,6 +300,7 @@
'extra' => array('menuaction' =>
$this->currentapp.'.uitts.index',
'cat_id'
=>$this->cat_id,
'filter'
=>$this->filter,
+
'user_filter'
=>$this->user_filter,
'district_id' =>
$this->district_id,
'query'
=>$this->query,
'second_display'
=> true,
@@ -298,6 +314,7 @@
'extra' => array('menuaction' =>
$this->currentapp.'.uitts.index',
'cat_id'
=>$this->cat_id,
'filter'
=>$this->filter,
+
'user_filter'
=>$this->user_filter,
'district_id' =>
$this->district_id,
'query'
=>$this->query,
'second_display'
=> true,
@@ -329,6 +346,7 @@
'order' =>$this->order,
'cat_id' =>$this->cat_id,
'filter' =>$this->filter,
+ 'user_filter'
=>$this->user_filter,
'query' =>$this->query,
'district_id' =>
$this->district_id,
'allrows' =>$this->allrows
@@ -364,6 +382,7 @@
'order' =>$this->order,
'cat_id' =>$this->cat_id,
'filter' =>$this->filter,
+ 'user_filter'
=>$this->user_filter,
'query' =>$this->query,
'district_id' =>
$this->district_id,
'allrows'
=>$this->allrows,
@@ -407,7 +426,12 @@
'district_list'
=> $this->bocommon->select_district_list('filter',$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'
+ 'select_district_name' =>
'district_id',
+
+ 'lang_user_statustext' =>
lang('Assigned to'),
+ 'select_user_name'
=> 'user_filter',
+ 'lang_no_user'
=> lang('No user'),
+ 'user_list'
=>
$this->bocommon->get_user_list_right2('filter',4,$this->user_filter,$this->acl2_location,'',$default='')
);
$appname
= lang('helpdesk');
@@ -857,7 +881,9 @@
'form_action'
=> $GLOBALS['phpgw']->link('/index.php',$form_link),
'done_action'
=>
$GLOBALS['phpgw']->link('/index.php','menuaction='.$this->currentapp.'.uitts.index'),
- 'value_subject'
=> '[ #'. $id . ' ] - ' .$ticket['subject'],
+ 'value_subject'
=> $ticket['subject'],
+ 'lang_subject_statustext' =>
lang('update subject'),
+ 'value_id'
=> '[ #'. $id . ' ] - ',
'lang_details'
=> lang('Details'),
'value_details'
=> $ticket['details'],
| [Prev in Thread] | Current Thread | [Next in Thread] |