From 67a10b011806a9ede36c626b593f32baf0d8026d Mon Sep 17 00:00:00 2001
From: aydreeihn <adriane@enhancesoft.com>
Date: Fri, 25 May 2018 11:09:07 -0500
Subject: [PATCH] Change wording for thread entry references when creating
task/ticket from Entry to avoid confusion
---
include/ajax.tasks.php | 5 ++---
include/ajax.tickets.php | 5 ++---
include/class.ticket.php | 7 +++----
3 files changed, 7 insertions(+), 10 deletions(-)
diff --git a/include/ajax.tasks.php b/include/ajax.tasks.php
index b379382b1..c92d72f23 100644
--- a/include/ajax.tasks.php
+++ b/include/ajax.tasks.php
@@ -122,15 +122,14 @@ class TasksAjaxAPI extends AjaxController {
$task->getId(),
$task->getNumber());
- $entryLink = sprintf('<a href="#entry-%d"><b>%d</b></a> (%s)',
- $_SESSION[':form-data']['eid'],
+ $entryLink = sprintf('<a href="#entry-%d"><b>%s</b></a>',
$_SESSION[':form-data']['eid'],
Format::datetime($_SESSION[':form-data']['timestamp']));
$note = array(
'title' => __('Task Created From Thread Entry'),
'note' => __('Task ' . $taskLink .
- '<br /> Thread Entry ID: ' . $entryLink)
+ '<br /> Thread Entry: ' . $entryLink)
);
$originalTask->postNote($note, $errors, $thisstaff);
diff --git a/include/ajax.tickets.php b/include/ajax.tickets.php
index 5c2584f76..51c4e6697 100644
--- a/include/ajax.tickets.php
+++ b/include/ajax.tickets.php
@@ -1356,15 +1356,14 @@ function refer($tid, $target=null) {
$task->getId(),
$task->getNumber());
- $entryLink = sprintf('<a href="#entry-%d"><b>%d</b></a> (%s)',
- $_SESSION[':form-data']['eid'],
+ $entryLink = sprintf('<a href="#entry-%d"><b>%s</b></a>',
$_SESSION[':form-data']['eid'],
Format::datetime($_SESSION[':form-data']['timestamp']));
$note = array(
'title' => __('Task Created From Thread Entry'),
'body' => __('Task ' . $taskLink .
- '<br /> Thread Entry ID: ' . $entryLink)
+ '<br /> Thread Entry: ' . $entryLink)
);
$ticket->logNote($note['title'], $note['body'], $thisstaff);
diff --git a/include/class.ticket.php b/include/class.ticket.php
index df25a4a0d..fe669668d 100644
--- a/include/class.ticket.php
+++ b/include/class.ticket.php
@@ -3947,20 +3947,19 @@ implements RestrictedAccess, Threadable, Searchable {
$ticket->getId(),
$ticket->getNumber());
- $entryLink = sprintf('<a href="#entry-%d"><b>%d</b></a> (%s)',
- $_SESSION[':form-data']['eid'],
+ $entryLink = sprintf('<a href="#entry-%d"><b>%s</b></a>',
$_SESSION[':form-data']['eid'],
Format::datetime($_SESSION[':form-data']['timestamp']));
$ticketNote = array(
'title' => __('Ticket Created From Thread Entry'),
'body' => __('Ticket ' . $ticketLink).
- '<br /> Thread Entry ID: ' . $entryLink);
+ '<br /> Thread Entry: ' . $entryLink);
$taskNote = array(
'title' => __('Ticket Created From Thread Entry'),
'note' => __('Ticket ' . $ticketLink).
- '<br /> Thread Entry ID: ' . $entryLink);
+ '<br /> Thread Entry: ' . $entryLink);
if ($oldTicket)
$oldTicket->logNote($ticketNote['title'], $ticketNote['body'], $thisstaff);
--
GitLab