composer/iTop
6
0
Fork 0
mirror of https://github.com/Combodo/iTop.git synced 2026-02-13 07:24:13 +01:00
Code Issues Packages Projects Releases Wiki Activity

N°4171 - Remove lock message from the log entry form when object is in edition

Browse Source
This commit is contained in:
Molkobain
2021-07-16 20:13:49 +02:00
parent e15953524a
commit 524919b946
1 changed files with 11 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
js/layouts/activity-panel/activity-panel.js
View File

@@ -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 {