Merge branch 'spidev' into 'master'
Kalender Bugfix See merge request fronk/thetool!1121
This commit is contained in:
@@ -1939,8 +1939,8 @@ $(document).ready(function () {
|
||||
if ($("#customer").select2('data')[0].spin) {// ID deines Editors
|
||||
var currentContent = tinymce.activeEditor.getContent();
|
||||
tinymce.activeEditor.setContent(currentContent + '<p style="margin-bottom: 0"><b>Service Pin: </b>' + $("#customer").select2('data')[0].spin + '</p>');
|
||||
|
||||
$('#description').val('Service Pin: ' + $("#customer").select2('data')[0].spin + '\n');
|
||||
//
|
||||
// $('#description').val('Service Pin: ' + $("#customer").select2('data')[0].spin + '\n');
|
||||
}
|
||||
|
||||
|
||||
@@ -1953,7 +1953,9 @@ $(document).ready(function () {
|
||||
if ($('#location').val() == "") {
|
||||
$('#location').val($("#ticket").select2('data')[0].location);
|
||||
}
|
||||
$('#description').val('<a href="https://project.xinon.at/projects/storungen-and-support/work_packages/' + $("#ticket").select2('data')[0].id + '/activity" target="_blank">Ticket Nr.: ' + $("#ticket").select2('data')[0].id + '</a>\n' + $("#ticket").select2('data')[0].subject);
|
||||
var currentContent = tinymce.activeEditor.getContent();
|
||||
tinymce.activeEditor.setContent(currentContent + '<p style="margin-bottom: 0"><b>Ticket Nr.: </b><a href="https://project.xinon.at/projects/storungen-and-support/work_packages/' + $("#ticket").select2('data')[0].id + '/activity" target="_blank">' + $("#ticket").select2('data')[0].id + '</a></p>\n' + $("#ticket").select2('data')[0].subject);
|
||||
// $('#description').val('<a href="https://project.xinon.at/projects/storungen-and-support/work_packages/' + $("#ticket").select2('data')[0].id + '/activity" target="_blank">Ticket Nr.: ' + $("#ticket").select2('data')[0].id + '</a>\n' + $("#ticket").select2('data')[0].subject);
|
||||
|
||||
|
||||
});
|
||||
|
||||
Reference in New Issue
Block a user