From 5e396f8ae82e287c1e65520bf98a36f81cfd70d9 Mon Sep 17 00:00:00 2001
From: Martin Ficzel <ficzel@sitegeist.de>
Date: Fri, 22 Mar 2019 13:42:45 +0100
Subject: [PATCH] TASK: Stay in the selected dimension during all ui operations

---
 Classes/Controller/ModuleController.php                | 2 ++
 Resources/Private/Templates/Module/EditVocabulary.html | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/Classes/Controller/ModuleController.php b/Classes/Controller/ModuleController.php
index 956c65a..3a84a96 100644
--- a/Classes/Controller/ModuleController.php
+++ b/Classes/Controller/ModuleController.php
@@ -294,6 +294,8 @@ public function createVocabularyAction(NodeInterface $taxonomyRoot, $title, $des
      */
     public function editVocabularyAction(NodeInterface $vocabulary)
     {
+        $taxonomyRoot = $this->taxonomyService->getRoot($vocabulary->getContext());
+        $this->view->assign('taxonomyRoot', $taxonomyRoot);
         $this->view->assign('vocabulary', $vocabulary);
         $this->view->assign('defaultVocabulary', $this->getNodeInDefaultDimensions($vocabulary));
     }
diff --git a/Resources/Private/Templates/Module/EditVocabulary.html b/Resources/Private/Templates/Module/EditVocabulary.html
index b3f3c59..fb6e1e9 100644
--- a/Resources/Private/Templates/Module/EditVocabulary.html
+++ b/Resources/Private/Templates/Module/EditVocabulary.html
@@ -47,7 +47,7 @@
                 </f:if>
             </div>
 
-            <f:link.action class="neos-button" action="index">{f:translate(id: 'module.cancel')}</f:link.action>
+            <f:link.action class="neos-button" action="index" arguments="{root: taxonomyRoot}">{f:translate(id: 'module.cancel')}</f:link.action>
             <f:form.submit value="{f:translate(id: 'module.save')}" class="neos-button neos-button-primary" />
 
         </fieldset>