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

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.
parent 0e29c8dd
No related branches found
No related tags found
No related merge requests found
...@@ -515,8 +515,6 @@ $tcount+= $ticket->getNumNotes(); ...@@ -515,8 +515,6 @@ $tcount+= $ticket->getNumNotes();
} }
?> ?>
</select> </select>
&nbsp;&nbsp;&nbsp;
<label><input type='checkbox' value='1' name="append" id="append" checked="checked"> Append</label>
<br> <br>
<?php <?php
} }
...@@ -539,7 +537,7 @@ $tcount+= $ticket->getNumNotes(); ...@@ -539,7 +537,7 @@ $tcount+= $ticket->getNumNotes();
placeholder="Start writing your response here. Use canned responses from the drop-down above" placeholder="Start writing your response here. Use canned responses from the drop-down above"
data-draft-object-id="<?php echo $ticket->getId(); ?>" data-draft-object-id="<?php echo $ticket->getId(); ?>"
rows="9" wrap="soft" rows="9" wrap="soft"
class="richtext ifhtml draft"><?php class="richtext ifhtml draft draft-delete"><?php
echo $info['response']; ?></textarea> echo $info['response']; ?></textarea>
</td> </td>
</tr> </tr>
...@@ -647,7 +645,7 @@ $tcount+= $ticket->getNumNotes(); ...@@ -647,7 +645,7 @@ $tcount+= $ticket->getNumNotes();
placeholder="Note details" placeholder="Note details"
rows="9" wrap="soft" data-draft-namespace="ticket.note" rows="9" wrap="soft" data-draft-namespace="ticket.note"
data-draft-object-id="<?php echo $ticket->getId(); ?>" 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> ?></textarea>
<span class="error"><?php echo $errors['note']; ?></span> <span class="error"><?php echo $errors['note']; ?></span>
<br> <br>
......
...@@ -213,18 +213,11 @@ var scp_prep = function() { ...@@ -213,18 +213,11 @@ var scp_prep = function() {
var box = $('#response',fObj), var box = $('#response',fObj),
redactor = box.data('redactor'); redactor = box.data('redactor');
if(canned.response) { if(canned.response) {
if($('#append',fObj).is(':checked') && $('#response',fObj).val()) { if (redactor)
if (redactor) redactor.insertHtml(canned.response);
redactor.insertHtml(canned.response); else
else box.val(box.val() + canned.response);
box.val(box.val() + canned.response);
}
else {
if (redactor)
redactor.set(canned.response);
else
box.val(canned.response);
}
if (redactor) if (redactor)
redactor.observeStart(); redactor.observeStart();
} }
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment