Skip to content
Snippets Groups Projects
Commit 62805814 authored by Peter Rotich's avatar Peter Rotich
Browse files

Merge remote branch 'upstream/develop-next' into develop-next

parents b20ee52a ce73de7f
Branches
Tags
No related merge requests found
...@@ -91,6 +91,7 @@ implements AuthenticatedUser, EmailContact, TemplateVariable, Searchable { ...@@ -91,6 +91,7 @@ implements AuthenticatedUser, EmailContact, TemplateVariable, Searchable {
'datetime_format' => '', 'datetime_format' => '',
'thread_view_order' => '', 'thread_view_order' => '',
'default_ticket_queue_id' => 0, 'default_ticket_queue_id' => 0,
'reply_redirect' => 'Ticket',
)); ));
$this->_config = $_config->getInfo(); $this->_config = $_config->getInfo();
} }
...@@ -347,6 +348,10 @@ implements AuthenticatedUser, EmailContact, TemplateVariable, Searchable { ...@@ -347,6 +348,10 @@ implements AuthenticatedUser, EmailContact, TemplateVariable, Searchable {
return $this->default_paper_size; return $this->default_paper_size;
} }
function getReplyRedirect() {
return $this->reply_redirect;
}
function forcePasswdChange() { function forcePasswdChange() {
return $this->change_passwd; return $this->change_passwd;
} }
...@@ -744,6 +749,7 @@ implements AuthenticatedUser, EmailContact, TemplateVariable, Searchable { ...@@ -744,6 +749,7 @@ implements AuthenticatedUser, EmailContact, TemplateVariable, Searchable {
'default_from_name' => $vars['default_from_name'], 'default_from_name' => $vars['default_from_name'],
'thread_view_order' => $vars['thread_view_order'], 'thread_view_order' => $vars['thread_view_order'],
'default_ticket_queue_id' => $vars['default_ticket_queue_id'], 'default_ticket_queue_id' => $vars['default_ticket_queue_id'],
'reply_redirect' => ($vars['reply_redirect'] == 'Queue') ? 'Queue' : 'Ticket',
) )
); );
$this->_config = $_config->getInfo(); $this->_config = $_config->getInfo();
......
...@@ -300,6 +300,23 @@ if ($avatar->isChangeable()) { ?> ...@@ -300,6 +300,23 @@ if ($avatar->isChangeable()) { ?>
<div class="error"><?php echo $errors['default_paper_size']; ?></div> <div class="error"><?php echo $errors['default_paper_size']; ?></div>
</td> </td>
</tr> </tr>
<tr>
<td><?php echo __('Reply Redirect'); ?>:
<div class="faded"><?php echo __('Redirect URL used after replying to a ticket.');?></div>
</td>
<td>
<select name="reply_redirect">
<?php
$options=array('Queue'=>__('Queue'),'Ticket'=>__('Ticket'));
foreach($options as $key=>$opt) {
echo sprintf('<option value="%s" %s>%s</option>',
$key,($staff->reply_redirect==$key)?'selected="selected"':'',$opt);
}
?>
</select>
<div class="error"><?php echo $errors['reply_redirect']; ?></div>
</td>
</tr>
</tbody> </tbody>
<tbody> <tbody>
<tr class="header"> <tr class="header">
......
...@@ -214,7 +214,7 @@ if($_POST && !$errors): ...@@ -214,7 +214,7 @@ if($_POST && !$errors):
$ticket = null; $ticket = null;
$redirect = 'tickets.php'; $redirect = 'tickets.php';
if ($ticket) if ($ticket && $thisstaff->getReplyRedirect() == 'Ticket')
$redirect = 'tickets.php?id='.$ticket->getId(); $redirect = 'tickets.php?id='.$ticket->getId();
} elseif (!$errors['err']) { } elseif (!$errors['err']) {
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment