From 291512ff34a30c06fcdc32d38ab71a95c4e32312 Mon Sep 17 00:00:00 2001 From: Nicolas Le Goff Date: Fri, 6 Jun 2014 16:42:24 +0200 Subject: [PATCH] Fix empty of collection --- lib/Alchemy/Phrasea/Controller/Admin/Collection.php | 8 ++++---- lib/classes/task/period/emptyColl.php | 2 +- templates/web/admin/collection/collection.html.twig | 4 ++++ 3 files changed, 9 insertions(+), 5 deletions(-) diff --git a/lib/Alchemy/Phrasea/Controller/Admin/Collection.php b/lib/Alchemy/Phrasea/Controller/Admin/Collection.php index 7781dd3766..3b0b870744 100644 --- a/lib/Alchemy/Phrasea/Controller/Admin/Collection.php +++ b/lib/Alchemy/Phrasea/Controller/Admin/Collection.php @@ -511,10 +511,10 @@ class Collection implements ControllerProviderInterface if ('json' === $app['request']->getRequestFormat()) { return $app->json(array( - 'success' => $success, - 'msg' => $msg, - 'bas_id' => $collection->get_base_id() - )); + 'success' => $success, + 'msg' => $msg, + 'bas_id' => $collection->get_base_id() + )); } return $app->redirectPath('admin_display_collection', array( diff --git a/lib/classes/task/period/emptyColl.php b/lib/classes/task/period/emptyColl.php index 09658e918f..dd016c7829 100644 --- a/lib/classes/task/period/emptyColl.php +++ b/lib/classes/task/period/emptyColl.php @@ -43,7 +43,7 @@ class task_period_emptyColl extends task_appboxAbstract protected function loadSettings(SimpleXMLElement $sx_task_settings) { - $this->base_id = (int) $sx_task_settings->base_id; + $this->base_id = (int) $sx_task_settings->bas_id; parent::loadSettings($sx_task_settings); } diff --git a/templates/web/admin/collection/collection.html.twig b/templates/web/admin/collection/collection.html.twig index ace6960dd0..4a681cc3cc 100644 --- a/templates/web/admin/collection/collection.html.twig +++ b/templates/web/admin/collection/collection.html.twig @@ -335,6 +335,10 @@ } else if(submitLink.hasClass('reload-tree')) { reloadTree('bases:bases', true); } + + if ("undefined" !== typeof datas.msg) { + alert(datas.msg); + } } else { alert(datas.msg); }