Merge pull request #867 from webhdx/content_tree_path_string

Use pathString instead of locationId in ContentTree
ezsystems · Mar 1, 2019 · 560fe20 · 560fe20
2 parents 0cd9205 + d0f7751
commit 560fe20
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/src/bundle/Resources/public/js/scripts/admin.location.content.tree.js b/src/bundle/Resources/public/js/scripts/admin.location.content.tree.js
@@ -32,7 +32,7 @@
 
     ReactDOM.render(
         React.createElement(eZ.modules.ContentTree, {
-            currentLocationId: parseInt(contentTreeContainer.dataset.currentLocationId, 10),
+            currentLocationPath: contentTreeContainer.dataset.currentLocationPath,
             restInfo: { token, siteaccess },
         }),
         contentTreeWrapper

diff --git a/src/bundle/Resources/views/content/locationview.html.twig b/src/bundle/Resources/views/content/locationview.html.twig
@@ -26,7 +26,7 @@
         {% endblock left_sidebar %}
 
         <div class="px-0 pb-4 ez-content-container">
-            <div class="ez-content-tree-container" data-tree-root-location-id="{{ admin_ui_config['contentTree']['treeRootLocationId'] }}" data-current-location-id="{{ location.id }}">
+            <div class="ez-content-tree-container" data-tree-root-location-id="{{ admin_ui_config['contentTree']['treeRootLocationId'] }}" data-current-location-path="{{ location.pathString }}">
                 <div class="ez-content-tree-container__wrapper"></div>
             </div>
             <div class="ez-location-view-container">