tyler.durden
/
pandorafms
mirror of https://github.com/pandorafms/pandorafms.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'ent-7439-metaconsola-dashboard-fallo-link-publico' into 'develop' 

Reference to base public_dashboard url

See merge request artica/pandorafms!4081
This commit is contained in:
Daniel Rodriguez 2021-05-10 09:14:58 +00:00
parent 12ccb680d6 fe932a0dd6
commit 4c768bc6cd
1 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
pandora_console/include/functions_ui.php
View File

@ -1483,7 +1483,10 @@ function ui_require_css_file($name, $path='include/styles/', $echo_tag=false)
return false; return false;
} }
if (is_metaconsole()) { if (is_metaconsole()
&& (isset($config['requirements_use_base_url']) === false
|| $config['requirements_use_base_url'] === false)
) {
$config['css'][$name] = '/../../'.$filename; $config['css'][$name] = '/../../'.$filename;
} else { } else {
$config['css'][$name] = $filename; $config['css'][$name] = $filename;
@ -1535,7 +1538,10 @@ function ui_require_javascript_file($name, $path='include/javascript/', $echo_ta
return false; return false;
} }
if (is_metaconsole()) { if (is_metaconsole()
&& (isset($config['requirements_use_base_url']) === false
|| $config['requirements_use_base_url'] === false)
) {
$config['js'][$name] = '../../'.$filename; $config['js'][$name] = '../../'.$filename;
} else { } else {
$config['js'][$name] = $filename; $config['js'][$name] = $filename;