extern/egroupware_official
1
0
Fork 0
mirror of https://github.com/EGroupware/egroupware.git synced 2024-11-14 03:54:10 +01:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
Needs to be adapted for EgwAction changes

This reverts commit ce1b244acc.
This commit is contained in:
nathan 2023-08-02 08:40:21 -06:00
parent ce1b244acc
commit 38bd4bed1b
4 changed files with 9 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
addressbook/js/app.ts
View File

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

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

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

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

@ -10,8 +10,6 @@
* @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()
*
@ -85,7 +83,7 @@ export function nm_action(_action, _senders, _target, _ids)
}
//console.log(_action); console.log(_senders);
let mgr = _action instanceof EgwActionManager ? _action : _action.getManager();
var mgr = _action.getManager();
var url = '#';
if (typeof _action.data.url != 'undefined')
@ -322,7 +320,7 @@ export function fetchAll(ids, nextmatch, callback)
callback.call(this, idsArr);
}
}
}, {});
},this);
count += 200;
} while (count < total)
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 {
color: darkgray;
color: white;
background-image: none;
}