From ed1c0dd6c983cdd0542b352ba5c677f1308f311e Mon Sep 17 00:00:00 2001
From: Peter Rotich <peter@osticket.com>
Date: Fri, 30 May 2014 15:16:48 +0000
Subject: [PATCH] Retire canned resp append checkbox on ticket reply
The default mode going forward will be to insert when Rich Text support is
enabled and append otherwise. To clear the draft the user can simply click
reset or delete draft icon on the bar.
Enable delete draft option on reply & internal note boxes for consistency.
---
include/staff/ticket-view.inc.php | 6 ++----
scp/js/scp.js | 17 +++++------------
2 files changed, 7 insertions(+), 16 deletions(-)
diff --git a/include/staff/ticket-view.inc.php b/include/staff/ticket-view.inc.php
index efb271758..d0b1b34d7 100644
--- a/include/staff/ticket-view.inc.php
+++ b/include/staff/ticket-view.inc.php
@@ -515,8 +515,6 @@ $tcount+= $ticket->getNumNotes();
}
?>
</select>
-
- <label><input type='checkbox' value='1' name="append" id="append" checked="checked"> Append</label>
<br>
<?php
}
@@ -539,7 +537,7 @@ $tcount+= $ticket->getNumNotes();
placeholder="Start writing your response here. Use canned responses from the drop-down above"
data-draft-object-id="<?php echo $ticket->getId(); ?>"
rows="9" wrap="soft"
- class="richtext ifhtml draft"><?php
+ class="richtext ifhtml draft draft-delete"><?php
echo $info['response']; ?></textarea>
</td>
</tr>
@@ -647,7 +645,7 @@ $tcount+= $ticket->getNumNotes();
placeholder="Note details"
rows="9" wrap="soft" data-draft-namespace="ticket.note"
data-draft-object-id="<?php echo $ticket->getId(); ?>"
- class="richtext ifhtml draft"><?php echo $info['note'];
+ class="richtext ifhtml draft draft-delete"><?php echo $info['note'];
?></textarea>
<span class="error"><?php echo $errors['note']; ?></span>
<br>
diff --git a/scp/js/scp.js b/scp/js/scp.js
index b2e0ba77b..fe7962dde 100644
--- a/scp/js/scp.js
+++ b/scp/js/scp.js
@@ -213,18 +213,11 @@ var scp_prep = function() {
var box = $('#response',fObj),
redactor = box.data('redactor');
if(canned.response) {
- if($('#append',fObj).is(':checked') && $('#response',fObj).val()) {
- if (redactor)
- redactor.insertHtml(canned.response);
- else
- box.val(box.val() + canned.response);
- }
- else {
- if (redactor)
- redactor.set(canned.response);
- else
- box.val(canned.response);
- }
+ if (redactor)
+ redactor.insertHtml(canned.response);
+ else
+ box.val(box.val() + canned.response);
+
if (redactor)
redactor.observeStart();
}
--
GitLab