From c3e3f0021d6058b0e2098379f765677e1cd2641b Mon Sep 17 00:00:00 2001
From: Jared Hancock <jared@osticket.com>
Date: Sat, 25 Jun 2016 09:59:27 -0500
Subject: [PATCH] tasks: Add template link to the ticket page
---
include/class.task.php | 10 +++++++---
include/class.template.php | 8 ++++----
2 files changed, 11 insertions(+), 7 deletions(-)
diff --git a/include/class.task.php b/include/class.task.php
index 6c4a30601..e2c5643a6 100644
--- a/include/class.task.php
+++ b/include/class.task.php
@@ -1004,13 +1004,15 @@ class Task extends TaskModel implements RestrictedAccess, Threadable {
case 'phone':
case 'phone_number':
return $this->getPhoneNumber();
- break;
+ case 'ticket_link':
+ if ($ticket = $this->ticket) {
+ return sprintf('%s/scp/tickets.php?id=%d#tasks',
+ $cfg->getBaseUrl(), $ticket->getId());
+ }
case 'staff_link':
return sprintf('%s/scp/tasks.php?id=%d', $cfg->getBaseUrl(), $this->getId());
- break;
case 'create_date':
return new FormattedDate($this->getCreateDate());
- break;
case 'due_date':
if ($due = $this->getEstDueDate())
return new FormattedDate($due);
@@ -1061,6 +1063,8 @@ class Task extends TaskModel implements RestrictedAccess, Threadable {
'thread' => array(
'class' => 'TaskThread', 'desc' => __('Task Thread'),
),
+ 'staff_link' => __('Link to view the task'),
+ 'ticket_link' => __('Link to view the task inside the ticket'),
'last_update' => array(
'class' => 'FormattedDate', 'desc' => __('Time of last update'),
),
diff --git a/include/class.template.php b/include/class.template.php
index 1f53922dd..53f1caf43 100644
--- a/include/class.template.php
+++ b/include/class.template.php
@@ -616,16 +616,16 @@ class EmailTemplate {
function save($id, $vars, &$errors) {
if(!$vars['subject'])
- $errors['subject']='Message subject is required';
+ $errors['subject'] = __('Message subject is required');
if(!$vars['body'])
- $errors['body']='Message body is required';
+ $errors['body'] = __('Message body is required');
if (!$id) {
if (!$vars['tpl_id'])
- $errors['tpl_id']='Template set is required';
+ $errors['tpl_id'] = __('Template set is required');
if (!$vars['code_name'])
- $errors['code_name']='Code name is required';
+ $errors['code_name'] = __('Code name is required');
}
if ($errors)
--
GitLab