hazza/Phraseanet
1
0
Fork 0
mirror of https://github.com/alchemy-fr/Phraseanet.git synced 2025-10-24 10:23:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix empty of collection

Browse Source
This commit is contained in:
Nicolas Le Goff
2014-06-06 16:42:24 +02:00
parent 25aca6845c
commit 291512ff34
3 changed files with 9 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
lib/Alchemy/Phrasea/Controller/Admin/Collection.php
View File

@@ -511,10 +511,10 @@ class Collection implements ControllerProviderInterface
if ('json' === $app['request']->getRequestFormat()) { if ('json' === $app['request']->getRequestFormat()) {
return $app->json(array( return $app->json(array(
'success' => $success, 'success' => $success,
'msg' => $msg, 'msg' => $msg,
'bas_id' => $collection->get_base_id() 'bas_id' => $collection->get_base_id()
)); ));
} }
return $app->redirectPath('admin_display_collection', array( return $app->redirectPath('admin_display_collection', array(

2
lib/classes/task/period/emptyColl.php
View File

@@ -43,7 +43,7 @@ class task_period_emptyColl extends task_appboxAbstract
protected function loadSettings(SimpleXMLElement $sx_task_settings) 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); parent::loadSettings($sx_task_settings);
} }

4
templates/web/admin/collection/collection.html.twig
View File

@@ -335,6 +335,10 @@
} else if(submitLink.hasClass('reload-tree')) { } else if(submitLink.hasClass('reload-tree')) {
reloadTree('bases:bases', true); reloadTree('bases:bases', true);
} }
if ("undefined" !== typeof datas.msg) {
alert(datas.msg);
}
} else { } else {
alert(datas.msg); alert(datas.msg);
} }