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

Fix opening the same URL twice did not go to the specified destination the second time

Browse Source 
Eg. tracker edit went to tracker index the second time
This commit is contained in:
nathangray 2017-08-04 10:27:16 -06:00
parent a8e27f2fad
commit 6566df4ff8
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
api/src/Framework/Ajax.php
View File

@ -856,8 +856,9 @@ abstract class Ajax extends Api\Framework
} }
// check if user called a specific url --> open it as active tab // check if user called a specific url --> open it as active tab
$active_tab = $GLOBALS['egw_info']['user']['preferences']['common']['active_tab'];
$last_direct_url =& Api\Cache::getSession(__CLASS__, 'last_direct_url'); $last_direct_url =& Api\Cache::getSession(__CLASS__, 'last_direct_url');
if ($url !== $last_direct_url) if ($url)
{ {
$active_tab = $url_tab = self::app_from_url($url); $active_tab = $url_tab = self::app_from_url($url);
$last_direct_url = $url; $last_direct_url = $url;
@ -878,7 +879,6 @@ abstract class Ajax extends Api\Framework
} }
else else
{ {
$active_tab = $GLOBALS['egw_info']['user']['preferences']['common']['active_tab'];
if (!$active_tab) $active_tab = $default_app; if (!$active_tab) $active_tab = $default_app;
} }
// if we have the open tabs in the session, use it instead the maybe forced common prefs open_tabs // if we have the open tabs in the session, use it instead the maybe forced common prefs open_tabs