Netsyms/Mods-for-HESK-Netsyms
2
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Closes #388 Properly insert ticket templates and canned responses when HTML is off

Browse Source
This commit is contained in:
Mike Koch 2015-10-22 22:06:24 -04:00
parent d66d1abef9
commit 7db763c1ee
4 changed files with 21 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
admin/admin_ticket.php
View File

@ -1983,7 +1983,7 @@ function hesk_printCanned()
tinymce.get("message").setContent(''); tinymce.get("message").setContent('');
tinymce.get("message").execCommand('mceInsertRawHTML', false, myMsg); tinymce.get("message").execCommand('mceInsertRawHTML', false, myMsg);
} else { } else {
document.getElementById('message').value = myMsg; $('#message').html(myMsg);
} }
} }
else { else {
@ -1992,8 +1992,8 @@ function hesk_printCanned()
tinymce.get("message").setContent(''); tinymce.get("message").setContent('');
tinymce.get("message").execCommand('mceInsertRawHTML', false, oldMsg + myMsg); tinymce.get("message").execCommand('mceInsertRawHTML', false, oldMsg + myMsg);
} else { } else {
var oldMsg = document.getElementById('message').value; var oldMsg = $('#message').html();
document.getElementById('message').value = oldMsg + myMsg; $('#message').html(oldMsg + myMsg);
} }
} }
} }

8
admin/manage_canned.php
View File

@ -248,9 +248,9 @@ $num = hesk_dbNumRows($result);
tinymce.get("message").execCommand('mceInsertRawHTML', false, ''); tinymce.get("message").execCommand('mceInsertRawHTML', false, '');
} }
else { else {
document.getElementById('message').value = ''; $('#message').html('');
} }
document.getElementById('subject').value = ''; $('#subject').val('');
return true; return true;
} }
if (document.getElementById) { if (document.getElementById) {
@ -258,8 +258,10 @@ $num = hesk_dbNumRows($result);
tinymce.get("message").setContent(''); tinymce.get("message").setContent('');
tinymce.get("message").execCommand('mceInsertRawHTML', false, myMsg); tinymce.get("message").execCommand('mceInsertRawHTML', false, myMsg);
} else { } else {
document.getElementById('message').value = myMsg; $('#message').html(myMsg);
} }
mySubject = $('<textarea />').html(mySubject).text();
$('#subject').val(mySubject);
document.getElementById('subject').value = mySubject; document.getElementById('subject').value = mySubject;
} }
else { else {

9
admin/manage_ticket_templates.php
View File

@ -326,9 +326,9 @@ $num = hesk_dbNumRows($result);
tinymce.get("message").execCommand('mceInsertRawHTML', false, ''); tinymce.get("message").execCommand('mceInsertRawHTML', false, '');
} }
else { else {
document.getElementById('message').value = ''; $('#message').html('');
} }
document.getElementById('subject').value = ''; $('#subject').val('');
return true; return true;
} }
if (document.getElementById) { if (document.getElementById) {
@ -336,9 +336,10 @@ $num = hesk_dbNumRows($result);
tinymce.get("message").setContent(''); tinymce.get("message").setContent('');
tinymce.get("message").execCommand('mceInsertRawHTML', false, myMsg); tinymce.get("message").execCommand('mceInsertRawHTML', false, myMsg);
} else { } else {
document.getElementById('message').value = myMsg; $('#message').html(myMsg);
} }
document.getElementById('subject').value = mySubject; mySubject = $('<textarea />').html(mySubject).text();
$('#subject').val(mySubject);
} }
else { else {
document.form1.message.value = myMsg; document.form1.message.value = myMsg;

14
admin/new_ticket.php
View File

@ -635,9 +635,9 @@ if (hesk_dbNumRows($res)) {
tinymce.get("message").execCommand('mceInsertRawHTML', false, ''); tinymce.get("message").execCommand('mceInsertRawHTML', false, '');
} }
else { else {
document.getElementById('message').value = ''; $('#message').html('');
} }
document.getElementById('subject').value = ''; $('#subject').html('');
} }
return true; return true;
} }
@ -647,9 +647,10 @@ if (hesk_dbNumRows($res)) {
tinymce.get("message").setContent(''); tinymce.get("message").setContent('');
tinymce.get("message").execCommand('mceInsertRawHTML', false, myMsg); tinymce.get("message").execCommand('mceInsertRawHTML', false, myMsg);
} else { } else {
document.getElementById('message').value = myMsg; $('#message').html(myMsg);
} }
document.getElementById('subject').value = mySubject; mySubject = $('<textarea />').html(mySubject).text();
$('#subject').val(mySubject);
} }
else { else {
if (useHtmlEditor) { if (useHtmlEditor) {
@ -658,10 +659,11 @@ if (hesk_dbNumRows($res)) {
tinymce.get("message").execCommand('mceInsertRawHTML', false, oldMsg + myMsg); tinymce.get("message").execCommand('mceInsertRawHTML', false, oldMsg + myMsg);
} else { } else {
var oldMsg = document.getElementById('message').value; var oldMsg = document.getElementById('message').value;
document.getElementById('message').value = oldMsg + myMsg; $('#message').html(oldMsg + myMsg);
} }
if (document.getElementById('subject').value == '') { if (document.getElementById('subject').value == '') {
document.getElementById('subject').value = mySubject; mySubject = $('<textarea />').html(mySubject).text();
$('#subject').val(mySubject);
} }
} }
} }