mirror/Part-DB.Part-DB-server
1
0
Fork 1
mirror of https://github.com/Part-DB/Part-DB-server.git synced 2025-06-24 02:38:50 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 5

Fixed exception in caching mechanism, if no user was logged in.

Browse source
This commit is contained in:
Jan Böhmer 2019-08-20 18:18:11 +02:00
parent 1445d7475a
commit 8e23629dc0
4 changed files with 91 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

15
src/Services/ToolsTreeBuilder.php
View file

@ -45,17 +45,18 @@ class ToolsTreeBuilder
protected $translator;
protected $urlGenerator;
protected $security;
protected $keyGenerator;
protected $cache;
public function __construct(TranslatorInterface $translator, UrlGeneratorInterface $urlGenerator,
TagAwareCacheInterface $treeCache, Security $security)
TagAwareCacheInterface $treeCache, UserCacheKeyGenerator $keyGenerator)
{
$this->translator = $translator;
$this->urlGenerator = $urlGenerator;
$this->security = $security;
$this->cache = $treeCache;
$this->keyGenerator = $keyGenerator;
}
/**
@ -65,13 +66,11 @@ class ToolsTreeBuilder
*/
public function getTree() : array
{
$username = $this->security->getUser()->getUsername();
$key = "tree_tools_" . $this->keyGenerator->generateKey();
$key = "tree_tools_" . $username;
return $this->cache->get($key, function (ItemInterface $item) use ($username) {
return $this->cache->get($key, function (ItemInterface $item) {
//Invalidate tree, whenever group or the user changes
$item->tag(["tree_tools", "groups", "user_" . $username]);
$item->tag(["tree_tools", "groups", $this->keyGenerator->generateKey()]);
$tree = array();
$tree[] = new TreeViewNode($this->translator->trans('tree.tools.edit'), null, $this->getEditNodes());