[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Phpgroupware-cvs] property inc/class.uitts.inc.php inc/hook_setti...
|
From: |
Sigurd Nes |
|
Subject: |
[Phpgroupware-cvs] property inc/class.uitts.inc.php inc/hook_setti... |
|
Date: |
Thu, 23 Aug 2007 13:29:35 +0000 |
CVSROOT: /sources/phpgroupware
Module name: property
Changes by: Sigurd Nes <sigurdne> 07/08/23 13:29:35
Modified files:
inc : class.uitts.inc.php hook_settings.inc.php
templates/base : tts.xsl
Log message:
configurable quick links for setting status for tickets
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/property/inc/class.uitts.inc.php?cvsroot=phpgroupware&r1=1.60&r2=1.61
http://cvs.savannah.gnu.org/viewcvs/property/inc/hook_settings.inc.php?cvsroot=phpgroupware&r1=1.16&r2=1.17
http://cvs.savannah.gnu.org/viewcvs/property/templates/base/tts.xsl?cvsroot=phpgroupware&r1=1.18&r2=1.19
Patches:
Index: inc/class.uitts.inc.php
===================================================================
RCS file: /sources/phpgroupware/property/inc/class.uitts.inc.php,v
retrieving revision 1.60
retrieving revision 1.61
diff -u -b -r1.60 -r1.61
--- inc/class.uitts.inc.php 8 Jun 2007 09:07:30 -0000 1.60
+++ inc/class.uitts.inc.php 23 Aug 2007 13:29:35 -0000 1.61
@@ -24,7 +24,7 @@
* @internal Development of this application was funded by
http://www.bergen.kommune.no/bbb_/ekstern/
* @package property
* @subpackage helpdesk
- * @version $Id: class.uitts.inc.php,v 1.60 2007/06/08 09:07:30 sigurdne
Exp $
+ * @version $Id: class.uitts.inc.php,v 1.61 2007/08/23 13:29:35 sigurdne
Exp $
*/
/**
@@ -301,21 +301,20 @@
'edit_status' => true,
'new_status' =>
$new_status,
'second_display'=> true,
- 'sort'
=>$this->sort,
- 'order'
=>$this->order,
- 'cat_id'
=>$this->cat_id,
- 'filter'
=>$this->filter,
- 'user_filter'
=>$this->user_filter,
- 'query'
=>$this->query,
+ 'sort'
=> $this->sort,
+ '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
+ 'allrows'
=> $this->allrows
);
-
$content[] = array
(
'id'
=> $ticket['id'],
- 'bgcolor'
=> $bgcolor[$ticket['priority']],
+ 'bgcolor'
=> $ticket['status']=='X' ? '#5EFB6E':$bgcolor[$ticket['priority']],
'new_ticket'
=> (isset($ticket['new_ticket'])?$ticket['new_ticket']:''),
'priostr'
=> $ticket['priority'],
'first'
=> $first,
@@ -333,7 +332,7 @@
'status'
=> $status,
'link_edit_status'
=> $GLOBALS['phpgw']->link('/index.php',$link_status_data),
'lang_edit_status'
=> lang('Edit status'),
- 'text_edit_status'
=> $text_edit_status
+ 'text_edit_status' =>
$text_edit_status,
);
}
@@ -599,7 +598,8 @@
'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($group_filters,4,$this->user_filter,$this->acl_location,'',$default='')
+ 'user_list'
=>
$this->bocommon->get_user_list_right2($group_filters,4,$this->user_filter,$this->acl_location,'',$default=''),
+ 'allow_edit_status'
=>
isset($GLOBALS['phpgw_info']['user']['preferences'][$this->currentapp]['tts_status_link'])
&&
$GLOBALS['phpgw_info']['user']['preferences'][$this->currentapp]['tts_status_link']
?
$GLOBALS['phpgw_info']['user']['preferences'][$this->currentapp]['tts_status_link']:''
);
$appname =
lang('helpdesk');
Index: inc/hook_settings.inc.php
===================================================================
RCS file: /sources/phpgroupware/property/inc/hook_settings.inc.php,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -b -r1.16 -r1.17
--- inc/hook_settings.inc.php 26 Jan 2007 14:53:47 -0000 1.16
+++ inc/hook_settings.inc.php 23 Aug 2007 13:29:35 -0000 1.17
@@ -24,7 +24,7 @@
* @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.16 2007/01/26 14:53:47
sigurdne Exp $
+ * @version $Id: hook_settings.inc.php,v 1.17 2007/08/23 13:29:35
sigurdne Exp $
*/
$this->currentapp =
$GLOBALS['phpgw_info']['flags']['currentapp'];
@@ -52,6 +52,8 @@
create_select_box('Default ticket status','tts_status',$tts_status,'The
default status when entering the helpdesk');
+ create_select_box('show quick link for changing status for
tickets','tts_status_link',$yes_and_no,'Enables to set status wihout entering
the ticket');
+
$acc = CreateObject('phpgwapi.accounts');
$group_list = $acc->get_list('groups');
while (list($key,$entry) = each($group_list))
Index: templates/base/tts.xsl
===================================================================
RCS file: /sources/phpgroupware/property/templates/base/tts.xsl,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -b -r1.18 -r1.19
--- templates/base/tts.xsl 19 May 2007 20:52:10 -0000 1.18
+++ templates/base/tts.xsl 23 Aug 2007 13:29:35 -0000 1.19
@@ -1,4 +1,4 @@
-<!-- $Id: tts.xsl,v 1.18 2007/05/19 20:52:10 sigurdne Exp $ -->
+<!-- $Id: tts.xsl,v 1.19 2007/08/23 13:29:35 sigurdne Exp $ -->
<xsl:template name="app_data">
<xsl:choose>
@@ -199,6 +199,8 @@
<xsl:value-of select="delay"/>
</td>
<td class="small_text" valign="top"
align="center">
+ <xsl:choose>
+ <xsl:when
test="//allow_edit_status != ''">
<xsl:variable
name="link_edit_status"><xsl:value-of select="link_edit_status"/></xsl:variable>
<xsl:variable
name="lang_edit_status"><xsl:value-of select="lang_edit_status"/></xsl:variable>
<xsl:variable
name="text_edit_status"><xsl:value-of select="text_edit_status"/></xsl:variable>
@@ -207,6 +209,11 @@
onMouseOver="overlib('{$text_edit_status}', CAPTION, '{$lang_edit_status}')"
onMouseOut="nd()">
<xsl:value-of
select="status"/></a>
+ </xsl:when>
+ <xsl:otherwise>
+ <xsl:value-of
select="status"/>
+ </xsl:otherwise>
+ </xsl:choose>
</td>
</tr>
</xsl:template>
@@ -229,7 +236,6 @@
</tr>
</xsl:template>
-
<xsl:template match="list2">
<xsl:variable name="autorefresh"><xsl:value-of
select="autorefresh"/></xsl:variable>
<META HTTP-EQUIV="Refresh" CONTENT="{$autorefresh}"/>
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Phpgroupware-cvs] property inc/class.uitts.inc.php inc/hook_setti...,
Sigurd Nes <=