Skip to content

fix(core): do not display treeview frame on login page #31

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
cedric-anne merged 2 commits into from
Jun 3, 2021
Merged

fix(core): do not display treeview frame on login page #31

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
bb3c563
fix(core): do not display treeview frame on login page
stonebuzz Jun 2, 2021
0a13da9
fix CS
stonebuzz Jun 2, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 14 additions & 0 deletions inc/config.class.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -563,4 +563,18 @@ function getNodesFromDb() {
echo "d.openTo(" .$nodes[count($nodes)-1]. ");\n";
}
}


/**
* Make sure that GLPI index page location is on top of window hierarchy
*/
public static function loginPageToTop() {
echo HTML::scriptBlock("
$(document).ready(
function() {
if (top != self)
top.location = self.location;
});
");
}
}
8 changes: 8 additions & 0 deletions setup.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -100,6 +100,14 @@ function plugin_init_treeview() {
if (Session::haveRight("config", UPDATE) || Session::haveRight("profile", UPDATE)) {
$PLUGIN_HOOKS['config_page']['treeview'] = 'front/config.form.php';
}

$currentPage = explode("/", $_SERVER['PHP_SELF']);
if (array_pop($currentPage) == "index.php") {
$PLUGIN_HOOKS['display_login']['treeview'] = [
"PluginTreeviewConfig",
"loginPageToTop"
];
}
}


Expand Down