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

[NodeBundle] Fix URLChooser to work with both single and multi language setups #1224

Merged
merged 2 commits into from
Jul 4, 2016
Merged

[NodeBundle] Fix URLChooser to work with both single and multi language setups #1224

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
0b95064
Fix URLChooser to work with multi/single languages. Issue #1223
iknowfoobar Jun 29, 2016
5b7702a
Merge https://github.com/Kunstmaan/KunstmaanBundlesCMS
iknowfoobar Jun 29, 2016
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
1 change: 1 addition & 0 deletions src/Kunstmaan/NodeBundle/Controller/WidgetsController.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,7 @@ public function selectLinkAction(Request $request)
{
$params = $this->getTemplateParameters($request);
$params['cke'] = false;
$params['multilanguage'] = $this->getParameter('multilanguage');

return $params;
}
Expand Down
3 changes: 2 additions & 1 deletion src/Kunstmaan/NodeBundle/Resources/views/Widgets/selectLink.html.twig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,8 @@
<hr>
</div>

<nav role="navigation" id="app__sidebar__navigation" class="app__sidebar__module app__sidebar__navigation" data-reorder-url="{{ path('KunstmaanNodeBundle_nodes_reorder') }}" data-base-url={{ "/" ~ app.request.locale }}>
{% if multilanguage %}{% set baseURL = "/" ~ app.request.locale %}{% else %}{% set baseURL = "" %}{% endif %}
<nav role="navigation" id="app__sidebar__navigation" class="app__sidebar__module app__sidebar__navigation" data-reorder-url="{{ path('KunstmaanNodeBundle_nodes_reorder') }}" data-base-url={{ baseURL }}>
<ul>
{% for item in tree.rootItems %}
{{ macros.selectLinkRecTreeView(tree, item) }}
Expand Down