diff --git a/assets/javascripts/issue_dynamic_edit.js b/assets/javascripts/issue_dynamic_edit.js index 21bf318..590d5e2 100644 --- a/assets/javascripts/issue_dynamic_edit.js +++ b/assets/javascripts/issue_dynamic_edit.js @@ -7,7 +7,8 @@ var _CONF_LISTENER_TYPE_VALUE = _CONF_LISTENER_TYPE_VALUE || "click"; var _CONF_LISTENER_TYPE_ICON = _CONF_LISTENER_TYPE_ICON || "none"; var _CONF_LISTENER_TARGET = _CONF_LISTENER_TARGET || "value"; var _CONF_EXCLUDED_FIELD_ID = _CONF_EXCLUDED_FIELD_ID || []; -var _CONF_CHECK_ISSUE_UPDATE_CONFLICT = _CONF_CHECK_ISSUE_UPDATE_CONFLICT || false; +var __hasKey = (typeof _REDMINE_API_KEY !== 'undefined') && _REDMINE_API_KEY.length; +var _CONF_CHECK_ISSUE_UPDATE_CONFLICT = (_CONF_CHECK_ISSUE_UPDATE_CONFLICT && __hasKey) || false; _CONF_LISTENER_TARGET = _CONF_LISTENER_TARGET === "all" ? "*" : _CONF_LISTENER_TARGET; @@ -299,10 +300,12 @@ const getVersion = function(callback){ let loadedDate = new Date(); const checkVersion = function(callback){ - fetch(LOCATION_HREF + ".json", { method: 'GET', crossDomain: true, + headers: { + 'X-Redmine-API-Key': _REDMINE_API_KEY + }, }).then(res => res.text()).then(data => { try { const parsedData = JSON.parse(data); diff --git a/lib/details_issue_hooks.rb b/lib/details_issue_hooks.rb index bcab8bf..f4e384a 100644 --- a/lib/details_issue_hooks.rb +++ b/lib/details_issue_hooks.rb @@ -25,12 +25,18 @@ def view_layouts_base_body_bottom(context) end def view_issues_show_details_bottom(context) + api_key = if Setting.rest_api_enabled? + User.current.api_key || "" + else + "" + end content = "\n" content << "