From 524919b94699f3449028247d8b8abf71bc56d42e Mon Sep 17 00:00:00 2001 From: Molkobain Date: Fri, 16 Jul 2021 20:13:49 +0200 Subject: [PATCH] =?UTF-8?q?N=C2=B04171=20-=20Remove=20lock=20message=20fro?= =?UTF-8?q?m=20the=20log=20entry=20form=20when=20object=20is=20in=20editio?= =?UTF-8?q?n?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- js/layouts/activity-panel/activity-panel.js | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/js/layouts/activity-panel/activity-panel.js b/js/layouts/activity-panel/activity-panel.js index 3bdeb7b7f..6e672eaf8 100644 --- a/js/layouts/activity-panel/activity-panel.js +++ b/js/layouts/activity-panel/activity-panel.js @@ -895,7 +895,12 @@ $(function() * @private */ _RequestLock: function () { - // Do not request lock again if we already have it or a request is already pending + // Abort lock request if it is not enabled + if (this.options.lock_enabled === false) { + return; + } + + // Abort lock request if we already have it or a request is already pending // Note: This can happen when we write in several case logs if ([this.enums.lock_status.request_pending, this.enums.lock_status.locked_by_myself].indexOf(this.options.lock_status) !== -1) { return; @@ -911,6 +916,11 @@ $(function() * @private */ _CancelLock: function () { + // Abort lock request if it is not enabled + if (this.options.lock_enabled === false) { + return; + } + if (this.enums.lock_status.locked_by_myself === this.options.lock_status) { this.options.lock_status = this.enums.lock_status.release_pending; } else {