diff --git a/lib/Alchemy/Phrasea/Controller/Admin/Root.php b/lib/Alchemy/Phrasea/Controller/Admin/Root.php index cdf0a8c4ad..d2b11ee42c 100644 --- a/lib/Alchemy/Phrasea/Controller/Admin/Root.php +++ b/lib/Alchemy/Phrasea/Controller/Admin/Root.php @@ -108,8 +108,6 @@ class Root implements ControllerProviderInterface return $app->redirectPath('logout'); } - $section = $request->query->get('section', false); - $available = array( 'connected', 'registrations', diff --git a/templates/web/admin/collection/collection.html.twig b/templates/web/admin/collection/collection.html.twig index 63064ef6da..ace6960dd0 100644 --- a/templates/web/admin/collection/collection.html.twig +++ b/templates/web/admin/collection/collection.html.twig @@ -123,7 +123,7 @@
- @@ -331,7 +331,7 @@ success: function(datas) { if(datas.success) { if(submitLink.hasClass('reload')) { - reloadTree('base:{{ collection.get_sbas_id() }}', true); + reloadTree('collection:{{ collection.get_base_id() }}', true); } else if(submitLink.hasClass('reload-tree')) { reloadTree('bases:bases', true); } diff --git a/templates/web/admin/databox/databox.html.twig b/templates/web/admin/databox/databox.html.twig index e29bd24d5a..48139db94b 100644 --- a/templates/web/admin/databox/databox.html.twig +++ b/templates/web/admin/databox/databox.html.twig @@ -146,7 +146,7 @@
- diff --git a/templates/web/admin/index.html.twig b/templates/web/admin/index.html.twig index 48e9bbf59c..d44bc3f9b9 100644 --- a/templates/web/admin/index.html.twig +++ b/templates/web/admin/index.html.twig @@ -150,8 +150,8 @@ }); if(click === true) { - if($('#tree li.selected').length > 0) - $('#tree li.selected a').trigger('click'); + if($('#tree .selected').length > 0) + $('#tree .selected a').trigger('click'); else $('.zone_online_users').trigger('click'); } diff --git a/templates/web/admin/tree.html.twig b/templates/web/admin/tree.html.twig index e7d1c5a539..da50ba8b2f 100644 --- a/templates/web/admin/tree.html.twig +++ b/templates/web/admin/tree.html.twig @@ -163,8 +163,14 @@ or collection.get_base_id() in app['authentication'].getUser().ACL.get_granted_base(['manage'])|keys or collection.get_base_id() in app['authentication'].getUser().ACL.get_granted_base(['modify_struct'])|keys) %} + {% if feature == 'collection' and featured == collection.get_base_id() %} + {% set coll_selected = true %} + {% else %} + {% set coll_selected = false %} + {% endif %} +
  • -
    +
    {{ collection.get_name() }}