+
diff --git a/com.yasoon.jira/Dialogs/jiraAddCommentDialog.js b/com.yasoon.jira/Dialogs/jiraAddCommentDialog.js
index c6686a5..3267f71 100644
--- a/com.yasoon.jira/Dialogs/jiraAddCommentDialog.js
+++ b/com.yasoon.jira/Dialogs/jiraAddCommentDialog.js
@@ -53,6 +53,16 @@ yasoon.dialog.load(new function () { //jshint ignore:line
// Resize Window if nessecary (sized are optimized for default Window - user may have changed that)
resizeWindow();
+
+ //Popover for Service Desk Warning
+ $('.servicedesk-popover').popover({
+ content: yasoon.i18n('dialog.serviceDeskWarningBody'),
+ title: yasoon.i18n('dialog.serviceDeskWarning'),
+ placement: 'top',
+ html: true,
+ template: '
+ ',
+ trigger: 'click' //'click'
+ });
//Save FieldType for later reuse.
self.fieldTypes = {
@@ -127,20 +137,20 @@ yasoon.dialog.load(new function () { //jshint ignore:line
});
}
- //Add Default Data
+ //Add Default Data
if (self.selectedText) {
- var text = self.selectedText;
-
- //Handle auto header add setting
- if (self.settings.addMailHeaderAutomatically === 'top') {
- text = renderMailHeaderText(self.mail, true) + '\n' + text;
- }
- else if (self.settings.addMailHeaderAutomatically === 'bottom') {
- text = text + '\n' + renderMailHeaderText(self.mail, true);
- }
-
- text = self.handleAttachments(text, self.mail.attachments);
- $('#comment').val(text);
+ var text = self.selectedText;
+
+ //Handle auto header add setting
+ if (self.settings.addMailHeaderAutomatically === 'top') {
+ text = renderMailHeaderText(self.mail, true) + '\n' + text;
+ }
+ else if (self.settings.addMailHeaderAutomatically === 'bottom') {
+ text = text + '\n' + renderMailHeaderText(self.mail, true);
+ }
+
+ text = self.handleAttachments(text, self.mail.attachments);
+ $('#comment').val(text);
}
self.loadingFinished();
@@ -228,11 +238,11 @@ yasoon.dialog.load(new function () { //jshint ignore:line
//Dispose all Attachments
jira.selectedAttachments.forEach(function (handle) {
- try {
- handle.dispose();
- } catch (e) {
- //System.Exception: TrackedObjectRegistry: Tried to access object which not found! (probably already de-referenced)
- }
+ try {
+ handle.dispose();
+ } catch (e) {
+ //System.Exception: TrackedObjectRegistry: Tried to access object which not found! (probably already de-referenced)
+ }
});
};
diff --git a/com.yasoon.jira/Dialogs/jiraFieldRenderer.js b/com.yasoon.jira/Dialogs/jiraFieldRenderer.js
index 8281ee4..5614816 100644
--- a/com.yasoon.jira/Dialogs/jiraFieldRenderer.js
+++ b/com.yasoon.jira/Dialogs/jiraFieldRenderer.js
@@ -1820,23 +1820,27 @@ function IssuePickerRenderer() {
} else if (jira.mode === 'jiraAddCommentDialog' && evt.params && evt.params.data) {
issue = evt.params.data;
} else {
- $('.buttons').removeClass('servicedesk');
+ $('.buttons').removeClass('servicedesk');
+ $('.buttons').removeClass('no-requesttype');
return;
}
var currentProject = jira.projects.filter(function (p) { return p.id === issue.project.id; })[0];
if (!currentProject || currentProject.projectTypeKey !== 'service_desk') {
- $('.buttons').removeClass('servicedesk');
+ $('.buttons').removeClass('servicedesk');
+ $('.buttons').removeClass('no-requesttype');
return;
}
//We have a service Project... Check if it is a service request
jiraGet('/rest/servicedeskapi/request/' + issue.id)
.then(function (data) {
- $('.buttons').addClass('servicedesk');
+ $('.buttons').addClass('servicedesk');
+ $('.buttons').removeClass('no-requesttype');
})
.catch(function (e) {
+ $('.buttons').addClass('no-requesttype');
$('.buttons').removeClass('servicedesk');
});
});
diff --git a/com.yasoon.jira/Dialogs/style.css b/com.yasoon.jira/Dialogs/style.css
index cf3e093..aa03d35 100644
--- a/com.yasoon.jira/Dialogs/style.css
+++ b/com.yasoon.jira/Dialogs/style.css
@@ -2964,3 +2964,14 @@ button.servicedesk {
display: inline !important;
}
+.servicedesk-warning {
+ display: none;
+}
+.no-requesttype .servicedesk-warning {
+ display: inline !important;
+}
+
+.buttons-container {
+ overflow: visible !important;
+}
+
diff --git a/com.yasoon.jira/functions.js b/com.yasoon.jira/functions.js
index df531bf..ffbeb22 100644
--- a/com.yasoon.jira/functions.js
+++ b/com.yasoon.jira/functions.js
@@ -273,7 +273,7 @@ function JiraRibbonController() {
var parameters = (inspectorId) ? inspectorId : true;
var method = (inspectorId) ? 'updateSingle' : 'update';
- console.log(item);
+
if (jiraIsTask(item)) {
var issue = JSON.parse(item.externalData);
diff --git a/com.yasoon.jira/locale/de.json b/com.yasoon.jira/locale/de.json
index 6d72931..8474482 100644
--- a/com.yasoon.jira/locale/de.json
+++ b/com.yasoon.jira/locale/de.json
@@ -120,8 +120,10 @@
"sprintAll": "Alle",
"unassigned": "Nicht zugewiesen",
"automatic": "Automatisch",
- "addCustomer": "Share with Customer",
- "addInternal": "Share internally"
+ "addCustomer": "Mit Kunden teilen",
+ "addInternal": "Interner Kommentar",
+ "serviceDeskWarningBody": "Der Vorgang hat keinen Anfragetyp.Obwohl es sich um einen Service Desk Vorgang handelt, ist ein Kommentar an den Kunden nicht möglich.",
+ "serviceDeskWarning": "Kein Anfragetyp"
},
"filter": {
"projectFilter": "Projekt",
diff --git a/com.yasoon.jira/locale/en.json b/com.yasoon.jira/locale/en.json
index 02b7df8..4ed9351 100644
--- a/com.yasoon.jira/locale/en.json
+++ b/com.yasoon.jira/locale/en.json
@@ -121,7 +121,9 @@
"unassigned": "Unassigned",
"automatic": "Automatic",
"addCustomer": "Share with Customer",
- "addInternal": "Share internally"
+ "addInternal": "Share internally",
+ "serviceDeskWarningBody": "The issue does not have a request type. Even it is a Service Desk issue, you cannot share comments with the customer.",
+ "serviceDeskWarning": "No Request Type"
},
"filter": {
"projectFilter": "Project",
diff --git a/com.yasoon.jira/settings.js b/com.yasoon.jira/settings.js
index f0de0c9..7594257 100644
--- a/com.yasoon.jira/settings.js
+++ b/com.yasoon.jira/settings.js
@@ -24,7 +24,7 @@ function JiraSettingController() {
taskSyncEnabled: false,
deleteCompletedTasks: false,
hideResolvedIssues: false,
- activeFilters: 'fields.project.id,fields.issuetype.id,fields.assignee.emailAddress,fields.status.id,fields.priority.id'
+ activeFilters: 'fields.project.id,fields.issuetype.id,fields.status.id,fields.priority.id,fields.assignee.emailAddress'
};
self.renderSettingsContainer = function renderSettingsContainer(container) {