From 37d4c3329cb49cb097c3e902960adeb54f5f2002 Mon Sep 17 00:00:00 2001
From: Peter Rotich <peter@osticket.com>
Date: Tue, 10 Jun 2014 17:37:37 +0000
Subject: [PATCH] Add ticket thread quotes to canned responses
Add original and last message quotes to canned responses
---
include/staff/ticket-view.inc.php | 24 +++++++++++++-----------
scp/ajax.php | 3 ++-
scp/js/scp.js | 14 ++++++++------
3 files changed, 23 insertions(+), 18 deletions(-)
diff --git a/include/staff/ticket-view.inc.php b/include/staff/ticket-view.inc.php
index d0b1b34d7..a63df79ea 100644
--- a/include/staff/ticket-view.inc.php
+++ b/include/staff/ticket-view.inc.php
@@ -505,19 +505,21 @@ $tcount+= $ticket->getNumNotes();
<label><strong>Response:</strong></label>
</td>
<td>
- <?php
- if(($cannedResponses=Canned::responsesByDeptId($ticket->getDeptId()))) {?>
- <select id="cannedResp" name="cannedResp">
- <option value="0" selected="selected">Select a canned response</option>
- <?php
- foreach($cannedResponses as $id =>$title) {
+ <select id="cannedResp" name="cannedResp">
+ <option value="0" selected="selected">Select a canned response</option>
+ <option value='lastmessage'>Original Message</option>
+ <option value='original'>Last Message</option>
+ <?php
+ if(($cannedResponses=Canned::responsesByDeptId($ticket->getDeptId()))) {
+ echo '<option value="0" disabled="disabled">
+ ------------- Premade Replies ------------- </option>';
+ foreach($cannedResponses as $id =>$title)
echo sprintf('<option value="%d">%s</option>',$id,$title);
- }
- ?>
- </select>
- <br>
+ }
+ ?>
+ </select>
+ <br>
<?php
- }
$signature = '';
switch ($thisstaff->getDefaultSignatureType()) {
case 'dept':
diff --git a/scp/ajax.php b/scp/ajax.php
index 6f784080b..a192cce8c 100644
--- a/scp/ajax.php
+++ b/scp/ajax.php
@@ -137,7 +137,8 @@ $dispatcher = patterns('',
url_get('^lookup', 'lookup'),
url_get('^search', 'search'),
url_get('^(?P<tid>\d+)/forms/manage$', 'manageForms'),
- url_post('^(?P<tid>\d+)/forms/manage$', 'updateForms')
+ url_post('^(?P<tid>\d+)/forms/manage$', 'updateForms'),
+ url_get('^(?P<tid>\d+)/canned-resp/(?P<cid>\w+).(?P<format>json|txt)', 'cannedResponse')
)),
url('^/collaborators/', patterns('ajax.tickets.php:TicketsAjaxAPI',
url_get('^(?P<cid>\d+)/view$', 'viewCollaborator'),
diff --git a/scp/js/scp.js b/scp/js/scp.js
index 294917b4d..40b04a962 100644
--- a/scp/js/scp.js
+++ b/scp/js/scp.js
@@ -195,16 +195,18 @@ var scp_prep = function() {
$('form select#cannedResp').change(function() {
- var fObj=$(this).closest('form');
- var cannedId = $(this).val();
- var ticketId = $(':input[name=id]',fObj).val();
-
+ var fObj = $(this).closest('form');
+ var cid = $(this).val();
+ var tid = $(':input[name=id]',fObj).val();
$(this).find('option:first').attr('selected', 'selected').parent('select');
+ var $url = 'ajax.php/kb/canned-response/'+cid+'.json';
+ if (tid)
+ $url = 'ajax.php/tickets/'+tid+'/canned-resp/'+cid+'.json';
+
$.ajax({
type: "GET",
- url: 'ajax.php/kb/canned-response/'+cannedId+'.json',
- data: 'tid='+ticketId,
+ url: $url,
dataType: 'json',
cache: false,
success: function(canned){
--
GitLab