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

Concurrent lock: Fix modal's button to match new convention

Browse Source
This commit is contained in:
Molkobain
2021-02-18 14:47:24 +01:00
parent 38c6f8c76f
commit 6634f3981e
1 changed files with 24 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
application/cmdbabstract.class.inc.php
View File

@@ -5147,7 +5147,18 @@ EOF
if ($('.lock_owned').length == 0) if ($('.lock_owned').length == 0)
{ {
$('.ui-layout-content').prepend('<div class="header_message message_error lock_owned">'+data.message+'</div>'); $('.ui-layout-content').prepend('<div class="header_message message_error lock_owned">'+data.message+'</div>');
$('<div>'+data.popup_message+'</div>').dialog({title: $sJSTitle, modal: true, autoOpen: true, minWidth: 600, buttons:[ {text: $sJSOk, click: function() { $(this).dialog('close'); } }], close: function() { $(this).remove(); }}); $('<div>'+data.popup_message+'</div>').dialog({
title: $sJSTitle,
modal: true,
autoOpen: true,
minWidth: 600,
buttons:[{
text: {$sJSOk},
class: 'ibo-is-alternative',
click: function() { $(this).dialog('close'); }
}],
close: function() { $(this).remove(); }
});
} }
$('.object-details form .ibo-toolbar .ibo-button:not([name="cancel"])').prop('disabled', true); $('.object-details form .ibo-toolbar .ibo-button:not([name="cancel"])').prop('disabled', true);
clearInterval(hOwnershipLockHandlerInterval); clearInterval(hOwnershipLockHandlerInterval);
@@ -5157,7 +5168,18 @@ EOF
if ($('.lock_owned').length == 0) if ($('.lock_owned').length == 0)
{ {
$('.ui-layout-content').prepend('<div class="header_message message_error lock_owned">'+data.message+'</div>'); $('.ui-layout-content').prepend('<div class="header_message message_error lock_owned">'+data.message+'</div>');
$('<div>'+data.popup_message+'</div>').dialog({title: $sJSTitle, modal: true, autoOpen: true, minWidth: 600, buttons:[ {text: $sJSOk, click: function() { $(this).dialog('close'); } }], close: function() { $(this).remove(); }}); $('<div>'+data.popup_message+'</div>').dialog({
title: $sJSTitle,
modal: true,
autoOpen: true,
minWidth: 600,
buttons:[{
text: $sJSOk,
class: 'ibo-is-alternative',
click: function() { $(this).dialog('close'); }
}],
close: function() { $(this).remove(); }
});
} }
$('.object-details form .ibo-toolbar .ibo-button:not([name="cancel"])').prop('disabled', true); $('.object-details form .ibo-toolbar .ibo-button:not([name="cancel"])').prop('disabled', true);
clearInterval(hOwnershipLockHandlerInterval); clearInterval(hOwnershipLockHandlerInterval);