extern/egroupware
1
0
Fork 1
mirror of https://github.com/EGroupware/egroupware.git synced 2025-08-19 04:46:42 +02:00
Code Issues Packages Projects Releases Wiki Activity

fix double message in popup and none in main window

Browse Source
This commit is contained in:
Ralf Becker
2020-07-24 09:23:44 +02:00
parent b60a9ffff4
commit 8bb9111cd5
2 changed files with 2 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
api/js/framework/fw_base.js
View File

@@ -1060,7 +1060,7 @@ var fw_base = (function(){ "use strict"; return Class.extend(
} }
// app running top-level (no full refresh / window reload!) // app running top-level (no full refresh / window reload!)
if (win == window) if (win == window && _app !== 'msg-only-push-refresh')
{ {
var refresh_done = false; var refresh_done = false;
// et2 nextmatch available, let it refresh // et2 nextmatch available, let it refresh

3
api/src/Framework/Extra.php
View File

@@ -61,8 +61,7 @@ abstract class Extra
!empty($type) && !empty($id) && // $type === null --> full reload !empty($type) && !empty($id) && // $type === null --> full reload
Link::get_registry($app, 'push_data') !== null) Link::get_registry($app, 'push_data') !== null)
{ {
self::$extra['message'] = [$msg, $msg_type]; $app = 'msg-only-push-refresh';
return;
} }
//error_log(__METHOD__.'('.array2string(func_get_args()).')'); //error_log(__METHOD__.'('.array2string(func_get_args()).')');
self::$extra['refresh-opener'] = func_get_args(); self::$extra['refresh-opener'] = func_get_args();