extern/egroupware
1
0
Fork 1
mirror of https://github.com/EGroupware/egroupware.git synced 2025-06-26 21:01:30 +02:00
Code Issues Packages Projects Releases Wiki Activity

Admin: Switch from et2_dialog to Et2Dialog

Browse Source
This commit is contained in:
nathan 2022-03-17 15:36:06 -06:00
parent 0479671ac4
commit 9087ea644b
1 changed files with 91 additions and 64 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

99
admin/js/app.ts
View File

@ -14,10 +14,11 @@
import {EgwApp, PushData} from '../../api/js/jsapi/egw_app';
import {etemplate2} from "../../api/js/etemplate/etemplate2";
import {et2_dialog} from "../../api/js/etemplate/et2_widget_dialog";
import {et2_createWidget} from "../../api/js/etemplate/et2_core_widget";
import {Et2Dialog} from "../../api/js/etemplate/Et2Dialog/Et2Dialog";
import {egw} from "../../api/js/jsapi/egw_global.js";
import {egwActionObject, egwAction} from '../../api/js/egw_action/egw_action.js';
import {egwAction, egwActionObject} from '../../api/js/egw_action/egw_action.js';
import {LitElement} from "@lion/core";
/**
* UI for Admin
*
@ -560,10 +561,17 @@ class AdminApp extends EgwApp
_acl_delete(ids)
{
var app = egw.app_name(); // can be either admin or preferences!
if (app != 'admin') app = 'preferences';
if(app != 'admin')
{
app = 'preferences';
}
var className = app + '_acl';
var callback = function(_button_id, _value) {
if(_button_id != et2_dialog.OK_BUTTON) return;
var callback = function(_button_id, _value)
{
if(_button_id != Et2Dialog.OK_BUTTON)
{
return;
}
var request = egw.json(className + '::ajax_change_acl', [ids, null, _value, this.et2._inst.etemplate_exec_id], this._acl_callback, this, false, this)
.sendRequest();
@ -573,7 +581,7 @@ class AdminApp extends EgwApp
var dialog_options = {
callback: callback,
title: this.egw.lang('Delete'),
buttons: et2_dialog.BUTTONS_OK_CANCEL,
buttons: Et2Dialog.BUTTONS_OK_CANCEL,
value: {
content: {},
sel_options: {},
@ -587,7 +595,6 @@ class AdminApp extends EgwApp
if(this.egw.user('apps').policy)
{
dialog_options['width'] = 550;
dialog_options['height'] = 350,
modifications.tabs = {
add_tabs: true,
tabs: [{
@ -598,7 +605,9 @@ class AdminApp extends EgwApp
};
}
// Create the dialog
this.acl_dialog = et2_createWidget("dialog", dialog_options, et2_dialog._create_parent(app));
this.acl_dialog = new Et2Dialog(app);
this.acl_dialog.transformAttributes(dialog_options);
document.body.appendChild(this.acl_dialog);
}
/**
@ -710,12 +719,19 @@ class AdminApp extends EgwApp
}
var dialog_options = {
callback: jQuery.proxy(function(_button_id, _value) {
callback: (_button_id, _value) =>
{
this.acl_dialog = null;
if(_button_id != et2_dialog.OK_BUTTON) return;
if(_button_id != Et2Dialog.OK_BUTTON)
{
return;
}
// Restore account if it's readonly in dialog
if(!_value.acl_account) _value.acl_account = content.acl_account;
if(!_value.acl_account)
{
_value.acl_account = content.acl_account;
}
// Handle no applications selected
if(typeof _value.apps == 'undefined' && content.acl_location == 'run')
@ -775,9 +791,9 @@ class AdminApp extends EgwApp
this.egw.json(className + '::ajax_change_acl', [id, rights, _value, this.et2._inst.etemplate_exec_id], callback ? callback : this._acl_callback, this, false, this)
.sendRequest();
}
},this),
},
title: this.egw.lang('Access control'),
buttons: et2_dialog.BUTTONS_OK_CANCEL,
buttons: Et2Dialog.BUTTONS_OK_CANCEL,
value: {
content: content,
// @todo: we need to investigate more on et2_widget_selectbox type of apps
@ -806,7 +822,10 @@ class AdminApp extends EgwApp
}
// Create the dialog
this.acl_dialog = et2_createWidget("dialog", dialog_options, et2_dialog._create_parent(app));
this.acl_dialog = new Et2Dialog(app);
this.acl_dialog.transformAttributes(dialog_options);
document.body.appendChild(<LitElement><unknown>this.acl_dialog);
}
/**
@ -919,7 +938,7 @@ class AdminApp extends EgwApp
if(removed_cat_label)
{
var msg = this.egw.lang('Removing access for groups may cause problems for data in this category. Are you sure? Users in these groups may no longer have access:');
return et2_dialog.confirm(button,msg + removed_cat_label.join(','));
return Et2Dialog.confirm(button, msg + removed_cat_label.join(','));
}
}
}
@ -1013,14 +1032,14 @@ class AdminApp extends EgwApp
}
else
{
et2_dialog.show_dialog(function(_button)
Et2Dialog.show_dialog(function(_button)
{
if (_button == et2_dialog.YES_BUTTON)
if(_button == Et2Dialog.YES_BUTTON)
{
submit();
}
}, this.egw.lang('Submit displayed information?'), '', {},
et2_dialog.BUTTONS_YES_NO, et2_dialog.QUESTION_MESSAGE, undefined, egw);
Et2Dialog.BUTTONS_YES_NO, Et2Dialog.QUESTION_MESSAGE, undefined, egw);
}
return false;
}
@ -1049,7 +1068,7 @@ class AdminApp extends EgwApp
{
var callback = function(button, value)
{
if(button === et2_dialog.YES_BUTTON)
if(button === Et2Dialog.YES_BUTTON)
{
var values = jQuery.extend(
{},
@ -1081,27 +1100,29 @@ class AdminApp extends EgwApp
if(egw.app('policy'))
{
import(egw.link('/policy/js/app.min.js?'+((new Date).valueOf()/86400|0).toString())).then(() => {
import(egw.link('/policy/js/app.min.js?' + ((new Date).valueOf() / 86400 | 0).toString())).then(() =>
{
if(typeof app.policy === 'undefined' || typeof app.policy.confirm === 'undefined')
{
app.policy = new app.classes.policy();
}
var parent = et2_dialog._create_parent(widget.egw());
var dialog = et2_createWidget("dialog", {
let dialog = new Et2Dialog(widget.egw());
dialog.transformAttributes({
callback: callback,
template: egw.link('/policy/templates/default/admin_cmd_narrow.xet'),
title: egw.lang('Delete'),
buttons: et2_dialog.BUTTONS_YES_NO,
title: 'Delete',
buttons: Et2Dialog.BUTTONS_YES_NO,
value: {content: {}},
width: 'auto'
}, parent);
});
widget.egw().window.document.body.appendChild(dialog);
dialog.egw().message("Entries with a deleted type can cause problems.\nCheck for entries with this type before deleting.", 'warning');
});
}
else
{
callback(et2_dialog.YES_BUTTON);
callback(Et2Dialog.YES_BUTTON);
}
return false;
}
@ -1123,10 +1144,11 @@ class AdminApp extends EgwApp
accounts[i] = [{id:_selected[i]['id'].split('::')[1],qouta:"", domain:"", status:_action.id == 'active'?_action.id:''}, this.et2._inst.etemplate_exec_id];
}
var callbackDialog = function (btn){
if (btn === et2_dialog.YES_BUTTON)
if(btn === Et2Dialog.YES_BUTTON)
{
// long task dialog for de/activation accounts
et2_dialog.long_task(function(_val, _resp){
Et2Dialog.long_task(function(_val, _resp)
{
if(_val && _resp.type !== 'error')
{
console.log(_val, _resp);
@ -1139,8 +1161,8 @@ class AdminApp extends EgwApp
}
};
// confirmation dialog
et2_dialog.show_dialog(callbackDialog, egw.lang('Are you sure you want to %1 mail for selected accounts?', egw.lang(_action.id)), egw.lang('Active Mail Accounts'), {},
et2_dialog.BUTTONS_YES_NO, et2_dialog.WARNING_MESSAGE, undefined, egw);
Et2Dialog.show_dialog(callbackDialog, egw.lang('Are you sure you want to %1 mail for selected accounts?', egw.lang(_action.id)), 'Active Mail Accounts', {},
Et2Dialog.BUTTONS_YES_NO, Et2Dialog.WARNING_MESSAGE, undefined, egw);
}
/**
@ -1432,8 +1454,8 @@ class AdminApp extends EgwApp
smime_genCertificate()
{
var self = this;
et2_createWidget("dialog",
{
let dialog = new Et2Dialog("mail");
dialog.transformAttributes({
callback(_button_id, _value)
{
if(_button_id == 'create' && _value)
@ -1444,7 +1466,10 @@ class AdminApp extends EgwApp
// check the required fields
for(var i = 0; i < required.length; i++)
{
if (_value[required[i]]) continue;
if(_value[required[i]])
{
continue;
}
widget = this.template.widgetContainer.getWidgetById(required[i]);
widget.set_validation_error('This field is required!');
isValid = false;
@ -1493,11 +1518,13 @@ class AdminApp extends EgwApp
value: {
content: {
value: ''
}},
}
},
template: egw.webserverUrl + '/mail/templates/default/smimeCertGen.xet?' + Date.now(),
resizable: false,
position: 'left top'
}, et2_dialog._create_parent('mail'));
});
document.body.appendChild(<LitElement><unknown>dialog);
}
/**