extern/egroupware_official
1
0
Fork 0
mirror of https://github.com/EGroupware/egroupware.git synced 2025-01-03 12:39:25 +01:00
Code Issues Packages Projects Releases Wiki Activity

fix a couple of problems with new images: infinite recursion and order they are found (navbar)

Browse Source
This commit is contained in:
ralf 2024-08-25 12:15:35 +02:00
parent 3e0cce403e
commit 62fbeda480
2 changed files with 4 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
api/js/jsapi/egw_images.js
View File

@ -103,13 +103,11 @@ egw.extend('images', egw.MODULE_GLOBAL, function()
}
}
tries['global'] = _name;
if (typeof images['global'] !== 'undefined' && typeof images['global'][_name] === 'string')
if (_name !== 'navbar' && // do NOT overwrite navbar images of all apps with placeholder
typeof images['global'] !== 'undefined' && typeof images['global'][_name] === 'string'&&
typeof images['bootstrap'] !== 'undefined' && typeof images['bootstrap'][images['global'][_name]] == 'string')
{
if (typeof images['bootstrap'] !== 'undefined' && typeof images['bootstrap'][_name] == 'string')
{
return this.webserverUrl+images['bootstrap'][_name];
}
return this.image(images['global'][_name], _app);
return this.webserverUrl+images['bootstrap'][images['global'][_name]];
}
tries[_app + (_app == 'phpgwapi' ? " (current app)" : "")] = _name;
if (typeof images[_app] != 'undefined' && typeof images[_app][_name] == 'string')

2
api/src/Image.php
View File

@ -133,8 +133,6 @@ class Image
'priority' => 'dash-circle',
'private' => 'key',
'reload' => 'arrow-clockwise',
'save' => 'api/save', // @todo: as bootstrap's save would shadow api/save and is not fitting
'save_new' => 'api/save_new', // @todo
'save_zip' => 'file-zip',
//'search' => 'search',
'security-update' => 'shield-exclamation',