[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Fmsystem-commits] [17115] More on helpdesk
|
From: |
sigurdne |
|
Subject: |
[Fmsystem-commits] [17115] More on helpdesk |
|
Date: |
Sun, 24 Sep 2017 12:42:06 -0400 (EDT) |
Revision: 17115
http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=17115
Author: sigurdne
Date: 2017-09-24 12:42:06 -0400 (Sun, 24 Sep 2017)
Log Message:
-----------
More on helpdesk
Modified Paths:
--------------
trunk/helpdesk/inc/class.botts.inc.php
trunk/helpdesk/inc/class.sotts.inc.php
trunk/helpdesk/inc/class.uitts.inc.php
trunk/helpdesk/js/portico/tts.add.js
trunk/helpdesk/js/portico/tts.view.js
trunk/helpdesk/setup/phpgw_no.lang
trunk/helpdesk/templates/base/config.tpl
trunk/helpdesk/templates/base/tts.xsl
Modified: trunk/helpdesk/inc/class.botts.inc.php
===================================================================
--- trunk/helpdesk/inc/class.botts.inc.php 2017-09-22 14:17:29 UTC (rev
17114)
+++ trunk/helpdesk/inc/class.botts.inc.php 2017-09-24 16:42:06 UTC (rev
17115)
@@ -844,11 +844,19 @@
if(!$get_message &&
!empty($this->config->config_data['new_message']))
{
$link_text =
"<H2>{$this->config->config_data['new_message']}</H2>";
- $link_text = nl2br(str_replace(array('__ID__'),
array($id, $num_updates), $link_text));
+ $link_text = nl2br(str_replace(array('__ID__'),
array($id), $link_text));
}
+ $set_user_id = false;
+ if(!$get_message &&
!empty($this->config->config_data['set_user_message']) &&
$_POST['values']['set_user_id'])
+ {
+ $set_user_id = (int)
$_POST['values']['set_user_id'];
+ $link_text =
"<H2>{$this->config->config_data['set_user_message']}</H2>";
+ $link_text = nl2br(str_replace(array('__ID__'),
array($id), $link_text));
+ }
+
// Normal update message
- if(!$get_message &&
!empty($this->config->config_data['update_message']) && $messages_sendt)
+ if(!$get_message &&
!empty($this->config->config_data['update_message']) && $messages_sendt &&
!$set_user_id)
{
$link_text =
"<H2>{$this->config->config_data['update_message']}</H2>";
$link_text = nl2br(str_replace(array('__ID__',
'__#__'), array($id, $num_updates), $link_text));
@@ -1003,7 +1011,9 @@
&&
($GLOBALS['phpgw']->preferences->data['helpdesk']['tts_notify_me'] == 1)
)
||
($this->config->config_data['ownernotification'] && $ticket['user_id'])
- || ($ticket['user_id'] && $send_mail))
+ || ($ticket['user_id'] && $send_mail)
+ || ($set_user_id)
+ )
{
// add owner to recipients
$members[$ticket['user_id']] =
$GLOBALS['phpgw']->accounts->id2name($ticket['user_id']);
Modified: trunk/helpdesk/inc/class.sotts.inc.php
===================================================================
--- trunk/helpdesk/inc/class.sotts.inc.php 2017-09-22 14:17:29 UTC (rev
17114)
+++ trunk/helpdesk/inc/class.sotts.inc.php 2017-09-24 16:42:06 UTC (rev
17115)
@@ -598,11 +598,11 @@
}
}
- if(!empty($ticket['reverse_id']))
+ if(!empty($ticket['set_user_id']))
{
$ticket['assignedto'] =
$GLOBALS['phpgw_info']['user']['account_id'];
}
- $ticket['user_id'] = !empty($ticket['reverse_id'])
? $ticket['reverse_id'] : $GLOBALS['phpgw_info']['user']['account_id'];
+ $ticket['user_id'] =
!empty($ticket['set_user_id']) ? $ticket['set_user_id'] :
$GLOBALS['phpgw_info']['user']['account_id'];
$value_set['priority'] = isset($ticket['priority']) ?
$ticket['priority'] : 0;
$value_set['user_id'] = $ticket['user_id'];
@@ -1061,12 +1061,12 @@
$receipt['message'][] = array('msg' =>
lang('billable hours has been updated'));
}
- if (!empty($ticket['forward_user_id']) && $old_user_id
!= $ticket['forward_user_id'] && $oldassigned == $this->account)
+ if (!empty($ticket['set_user_id']) && $old_user_id !=
$ticket['set_user_id'] && $oldassigned == $this->account)
{
- $forward_user_id = (int)
$ticket['forward_user_id'];
- $this->db->query("UPDATE phpgw_helpdesk_tickets
SET user_id = {$forward_user_id}"
+ $set_user_id = (int) $ticket['set_user_id'];
+ $this->db->query("UPDATE phpgw_helpdesk_tickets
SET user_id = {$set_user_id}"
. " WHERE id='{$id}'", __LINE__,
__FILE__);
- $this->historylog->add('FW', $id,
$forward_user_id, $old_user_id);
+ $this->historylog->add('FW', $id, $set_user_id,
$old_user_id);
$receipt['message'][] = array('msg' =>
lang('ticket is forwarded'));
}
Modified: trunk/helpdesk/inc/class.uitts.inc.php
===================================================================
--- trunk/helpdesk/inc/class.uitts.inc.php 2017-09-22 14:17:29 UTC (rev
17114)
+++ trunk/helpdesk/inc/class.uitts.inc.php 2017-09-24 16:42:06 UTC (rev
17115)
@@ -2082,7 +2082,7 @@
'type' => 'tax', 'selected' =>
$ticket['tax_code'], 'order' => 'id',
'id_in_name' => 'num'))),
'tabs' =>
phpgwapi_jquery::tabview_generate($tabs, $active_tab),
- 'forward_user' => ($ticket['user_id'] !=
$ticket['reverse_id'] && $ticket['assignedto'] == $this->account) ? true :
false
+ 'set_user' => ($ticket['user_id'] !=
$ticket['reverse_id'] && $ticket['assignedto'] == $this->account) ? true :
false
);
phpgwapi_jquery::load_widget('numberformat');
Modified: trunk/helpdesk/js/portico/tts.add.js
===================================================================
--- trunk/helpdesk/js/portico/tts.add.js 2017-09-22 14:17:29 UTC (rev
17114)
+++ trunk/helpdesk/js/portico/tts.add.js 2017-09-24 16:42:06 UTC (rev
17115)
@@ -266,4 +266,4 @@
var oArgs = {menuaction: 'helpdesk.uitts.get_reverse_assignee'};
var strURL = phpGWLink('index.php', oArgs, true);
-JqueryPortico.autocompleteHelper(strURL, 'reverse_name', 'reverse_id',
'reverse_container');
+JqueryPortico.autocompleteHelper(strURL, 'set_user_name', 'set_user_id',
'set_user_container');
\ No newline at end of file
Modified: trunk/helpdesk/js/portico/tts.view.js
===================================================================
--- trunk/helpdesk/js/portico/tts.view.js 2017-09-22 14:17:29 UTC (rev
17114)
+++ trunk/helpdesk/js/portico/tts.view.js 2017-09-24 16:42:06 UTC (rev
17115)
@@ -330,4 +330,4 @@
var oArgs = {menuaction: 'helpdesk.uitts.get_reverse_assignee'};
var strURL = phpGWLink('index.php', oArgs, true);
-JqueryPortico.autocompleteHelper(strURL, 'forward_user_name',
'forward_user_id', 'forward_user_container');
+JqueryPortico.autocompleteHelper(strURL, 'set_user_name', 'set_user_id',
'set_user_container');
Modified: trunk/helpdesk/setup/phpgw_no.lang
===================================================================
--- trunk/helpdesk/setup/phpgw_no.lang 2017-09-22 14:17:29 UTC (rev 17114)
+++ trunk/helpdesk/setup/phpgw_no.lang 2017-09-24 16:42:06 UTC (rev 17115)
@@ -203,6 +203,7 @@
reverse helpdesk no Revers tildeling
owned by helpdesk no Eies av
new message helpdesk no Svarmelding ved ny sak
+set user message helpdesk no Svarmelding ved ny eier av sak
ved reverstildeling
update message helpdesk no Svarmelding ved oppdatert sak
close message helpdesk no Svarmelding ved avsluttet sak
list %1 helpdesk no List %1
Modified: trunk/helpdesk/templates/base/config.tpl
===================================================================
--- trunk/helpdesk/templates/base/config.tpl 2017-09-22 14:17:29 UTC (rev
17114)
+++ trunk/helpdesk/templates/base/config.tpl 2017-09-24 16:42:06 UTC (rev
17115)
@@ -24,6 +24,10 @@
<td><input name="newsettings[new_message]"
value="{value_new_message}"></td>
</tr>
<tr>
+ <td>{lang_set_user_message}:</br> '__ID__' </td>
+ <td><input name="newsettings[set_user_message]"
value="{value_set_user_message}"></td>
+ </tr>
+ <tr>
<td>{lang_update_message}:</br> '__ID__', '__#__' </td>
<td><input name="newsettings[update_message]"
value="{value_update_message}"></td>
</tr>
Modified: trunk/helpdesk/templates/base/tts.xsl
===================================================================
--- trunk/helpdesk/templates/base/tts.xsl 2017-09-22 14:17:29 UTC (rev
17114)
+++ trunk/helpdesk/templates/base/tts.xsl 2017-09-24 16:42:06 UTC (rev
17115)
@@ -101,10 +101,10 @@
<label>
<xsl:value-of select="$lang_reverse"/>
</label>
- <input
type="hidden" id="reverse_id" name="values[reverse_id]"
value="{value_reverse_id}"/>
- <input
type="text" id="reverse_name" name="values[reverse_name]"
value="{value_reverse_name}" class="pure-input-1-2">
+ <input
type="hidden" id="set_user_id" name="values[set_user_id]"
value="{value_set_user}"/>
+ <input
type="text" id="set_user_name" name="values[set_user_name]"
value="{value_set_user_name}" class="pure-input-1-2">
</input>
- <div
id="reverse_container"/>
+ <div
id="set_user_container"/>
</div>
<!--xsl:call-template
name="contact_form"/-->
<!--div
class="pure-control-group">
@@ -343,7 +343,7 @@
</label>
<xsl:value-of
select="value_owned_by"/>
</div>
- <xsl:if test="forward_user ='1'">
+ <xsl:if test="set_user ='1'">
<div class="pure-control-group">
<xsl:variable
name="lang_forward">
<xsl:value-of
select="php:function('lang', 'forward')"/>
@@ -351,10 +351,10 @@
<label>
<xsl:value-of
select="$lang_forward"/>
</label>
- <input type="hidden"
id="forward_user_id" name="values[forward_user_id]"
value="{value_forward_user}"/>
- <input type="text"
id="forward_user_name" name="values[forward_user_name]"
value="{value_forward_user_name}" class="pure-input-1-2">
+ <input type="hidden"
id="set_user_id" name="values[set_user_id]" value="{value_set_user}"/>
+ <input type="text"
id="set_user_name" name="values[set_user_name]" value="{value_set_user_name}"
class="pure-input-1-2">
</input>
- <div
id="forward_user_container"/>
+ <div
id="set_user_container"/>
</div>
</xsl:if>
<xsl:for-each select="value_origin">
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Fmsystem-commits] [17115] More on helpdesk,
sigurdne <=