Skip to content
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

Use pathString instead of locationId in ContentTree #867

Merged
merged 2 commits into from
Mar 1, 2019
Merged

Use pathString instead of locationId in ContentTree #867

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
9fea4dd
EZP-30187: Use pathString instead of locationId in ContentTree
webhdx Feb 28, 2019
d0f7751
EZP-30187: Pass currentLocationPath to Content Tree component
tischsoic Feb 28, 2019
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
2 changes: 1 addition & 1 deletion src/bundle/Resources/public/js/scripts/admin.location.content.tree.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion src/bundle/Resources/views/content/locationview.html.twig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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">
Expand Down