From 2d8e53bef27856a7836c112e3adedcd8eccd8397 Mon Sep 17 00:00:00 2001 From: Romain Neutron Date: Wed, 10 Jul 2013 14:36:48 +0200 Subject: [PATCH] Reload tree after databox unmount --- lib/Alchemy/Phrasea/Controller/Admin/Databox.php | 4 +--- lib/Alchemy/Phrasea/Controller/Admin/Databoxes.php | 1 + templates/web/admin/databases.html.twig | 6 ++++++ 3 files changed, 8 insertions(+), 3 deletions(-) diff --git a/lib/Alchemy/Phrasea/Controller/Admin/Databox.php b/lib/Alchemy/Phrasea/Controller/Admin/Databox.php index ab345baa0c..fb02a9dac9 100644 --- a/lib/Alchemy/Phrasea/Controller/Admin/Databox.php +++ b/lib/Alchemy/Phrasea/Controller/Admin/Databox.php @@ -854,9 +854,7 @@ class Databox implements ControllerProviderInterface )); } - return $app->redirectPath('admin_database', array( - 'databox_id' => $databox_id, - 'error' => 'file-too-big', + return $app->redirectPath('admin_databases', array( 'reload-tree' => 1, )); } diff --git a/lib/Alchemy/Phrasea/Controller/Admin/Databoxes.php b/lib/Alchemy/Phrasea/Controller/Admin/Databoxes.php index 8fef608c36..3b1f93a861 100644 --- a/lib/Alchemy/Phrasea/Controller/Admin/Databoxes.php +++ b/lib/Alchemy/Phrasea/Controller/Admin/Databoxes.php @@ -186,6 +186,7 @@ class Databoxes implements ControllerProviderInterface 'error_msg' => $errorMsg, 'recommendations' => $upgrader->getRecommendations(), 'advices' => $request->query->get('advices', array()), + 'reloadTree' => (Boolean) $request->query->get('reload-tree'), )); } diff --git a/templates/web/admin/databases.html.twig b/templates/web/admin/databases.html.twig index a00dbde5b6..b6b5fe1945 100644 --- a/templates/web/admin/databases.html.twig +++ b/templates/web/admin/databases.html.twig @@ -1,3 +1,9 @@ +{% if reloadTree %} + +{% endif %} + {% if app['request'].query.get('success') == '1' %}
×