extern/egroupware_official
1
0
Fork 0
mirror of https://github.com/EGroupware/egroupware.git synced 2024-11-21 23:43:17 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix insert multiple entries into email document failed at "Please wait ... loading"

Browse Source
This commit is contained in:
nathan 2023-08-01 09:11:09 -06:00
parent 76c59d2103
commit 583072ce9d
4 changed files with 11 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
addressbook/js/app.ts
View File

@ -1125,12 +1125,13 @@ class AddressbookApp extends EgwApp
var callback = function(button, value) { var callback = function(button, value) {
if(button == Et2Dialog.OK_BUTTON) if(button == Et2Dialog.OK_BUTTON)
{ {
var _action = jQuery.extend(true, {}, action); var _action_data = jQuery.extend(true, {}, action.data);
if(value.infolog) if(value.infolog)
{ {
_action.data.menuaction += '&to_app=infolog&info_type=' + value.info_type; _action_data.menuaction += '&to_app=infolog&info_type=' + value.info_type;
action.data = _action_data;
} }
nm_action(_action, selected, target); nm_action(action, selected, target);
} }
}; };
let dialog = new Et2Dialog(this.egw); let dialog = new Et2Dialog(this.egw);

5
api/js/etemplate/Et2Dialog/Et2Dialog.ts
View File

@ -1357,7 +1357,6 @@ export class Et2Dialog extends Et2Widget(SlotMixin(SlDialog))
retry.transformAttributes({ retry.transformAttributes({
callback: function(button) callback: function(button)
{ {
debugger;
switch(button) switch(button)
{ {
case 'dialog[cancel]': case 'dialog[cancel]':
@ -1435,8 +1434,8 @@ export class Et2Dialog extends Et2Widget(SlotMixin(SlDialog))
} }
// Disable cancel (it's too late), enable OK // Disable cancel (it's too late), enable OK
dialog._overlayContentNode.querySelector('et2-button[button_id="' + Et2Dialog.CANCEL_BUTTON + '"]').setAttribute("disabled") dialog.querySelector('et2-button[button_id="' + Et2Dialog.CANCEL_BUTTON + '"]').setAttribute("disabled", "")
dialog._overlayContentNode.querySelector('et2-button[button_id="' + Et2Dialog.OK_BUTTON + '"]').removeAttribute("disabled") dialog.querySelector('et2-button[button_id="' + Et2Dialog.OK_BUTTON + '"]').removeAttribute("disabled")
if(!cancel && typeof _callback == "function") if(!cancel && typeof _callback == "function")
{ {
_callback.call(dialog, true, response); _callback.call(dialog, true, response);

6
api/js/etemplate/et2_extension_nextmatch_actions.js
View File

@ -10,6 +10,8 @@
* @copyright EGroupware GmbH 2012-2021 * @copyright EGroupware GmbH 2012-2021
*/ */
import {EgwActionManager} from "../egw_action/EgwActionManager";
/** /**
* Default action for nextmatch rows, runs action specified _action.data.nm_action: see nextmatch_widget::egw_actions() * Default action for nextmatch rows, runs action specified _action.data.nm_action: see nextmatch_widget::egw_actions()
* *
@ -83,7 +85,7 @@ export function nm_action(_action, _senders, _target, _ids)
} }
//console.log(_action); console.log(_senders); //console.log(_action); console.log(_senders);
var mgr = _action.getManager(); let mgr = _action instanceof EgwActionManager ? _action : _action.getManager();
var url = '#'; var url = '#';
if (typeof _action.data.url != 'undefined') if (typeof _action.data.url != 'undefined')
@ -320,7 +322,7 @@ export function fetchAll(ids, nextmatch, callback)
callback.call(this, idsArr); callback.call(this, idsArr);
} }
} }
},this); }, {});
count += 200; count += 200;
} while (count < total) } while (count < total)
return true; return true;

2
api/templates/default/etemplate2.css
View File

@ -2795,7 +2795,7 @@ table.egwGridView_outer thead tr th.noResize:hover {
} }
.long_task .message.error { .long_task .message.error {
color: white; color: darkgray;
background-image: none; background-image: none;
} }