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

N°6154 N°6219 - Relations Read - tooltip, confirmation title and message (#486)

Browse Source 
N°6154 - n:n Read - tooltip, confirmation title and message on Add-Edit-Remove
N°6219 - 1:n Read: tooltip, modal title and message on Add-Edit-Remove-Delete
This commit is contained in:
bdalsass
2023-04-28 14:43:53 +02:00
committed by GitHub
parent 269c1bf005
commit de35d941c1
28 changed files with 461 additions and 254 deletions
Download Patch File Download Diff File Expand all files Collapse all files

43
js/pages/backoffice/toolbox.js
View File

@@ -325,10 +325,12 @@ CombodoModal._ConvertButtonDefinition = function (aButtonsDefinitions) {
if(aButtonsDefinitions === null) {
return aConverted
}
aButtonsDefinitions.forEach(element => {
Object.keys(aButtonsDefinitions).forEach(key => {
const element = aButtonsDefinitions[key];
console.log(element);
const aButton = {
text: element.text,
class: element.class,
class: typeof(element.classes) !== 'undefined' ? element.classes.join(' ') : '',
click: element.callback_on_click
}
aConverted.push(aButton);
@@ -366,43 +368,40 @@ CombodoModal.OpenConfirmationModal = function(oOptions, aData) {
}
}
// Merge external options with confirmation modal default options
oOptions = $.extend({
oOptions = $.extend(true, {
title: Dict.S('UI:Modal:DefaultConfirmationTitle'),
content: '',
confirm_button_label: null,
do_not_show_again_pref_key: null,
callback_on_confirm: null,
callback_on_cancel: null,
extra_options: {
callback_on_modal_close: function () {
$(this).dialog( "destroy" ); // destroy dialog object
}
},
buttons: [
{
buttons: {
cancel: {
text: Dict.S('UI:Button:Cancel'),
class: 'ibo-is-alternative',
classes: ['ibo-is-alternative'],
callback_on_click: function () {
// call confirm handler and close dialog
let bCanClose = true;
if(oOptions.callback_on_cancel != null){
if (oOptions.callback_on_cancel != null) {
bCanClose = oOptions.callback_on_cancel(...aData) !== false;
}
if(bCanClose){
if (bCanClose) {
$(this).dialog('close'); // close dialog
}
}
},
{
text: oOptions.confirm_button_label ?? Dict.S('UI:Button:Confirm'),
class: 'ibo-is-primary',
confirm: {
text: Dict.S('UI:Button:Confirm'),
classes: ['ibo-is-primary'],
callback_on_click: function () {
// Call confirm handler and close dialog
let bCanClose = true;
if(oOptions.callback_on_confirm != null){
if (oOptions.callback_on_confirm != null) {
bCanClose = oOptions.callback_on_confirm(...aData) !== false;
}
if(bCanClose){
if (bCanClose) {
$(this).dialog('close'); // close dialog
// Handle "do not show again" user preference
let bDoNotShowAgain = oOptions.do_not_show_again_pref_key !== null ?
@@ -414,7 +413,7 @@ CombodoModal.OpenConfirmationModal = function(oOptions, aData) {
}
}
}
],
},
callback_on_content_loaded: function(oModalContentElement){
// Add option do not show again from template
if(oOptions.do_not_show_again_pref_key !== null) {
@@ -444,15 +443,15 @@ CombodoModal.OpenInformativeModal = function(sMessage, sSeverity, oOptions) {
$(this).dialog( "destroy" );
}
},
buttons: [
{
buttons: {
ok: {
text: Dict.S('UI:Button:Ok'),
class: 'ibo-is-regular ibo-is-neutral',
// classes: ['ibo-is-regular', 'ibo-is-neutral'],
callback_on_click: function () {
$(this).dialog('close');
$(this).dialog('close');
}
},
],
},
}, oOptions);
// Open modal