From bfffa8de60675edede87399342868a7683f08b41 Mon Sep 17 00:00:00 2001
From: Nicolas Le Goff <legoff.n@gmail.com>
Date: Wed, 31 Jul 2013 14:36:13 +0200
Subject: [PATCH] Fix #1327 & #1326 Can not delete or empty collection

---
 .../Phrasea/Controller/Admin/Databox.php      | 20 +++++++++++--------
 .../web/admin/collection/collection.html.twig | 13 +++++++-----
 templates/web/admin/databox/databox.html.twig |  9 +++++----
 3 files changed, 25 insertions(+), 17 deletions(-)

diff --git a/lib/Alchemy/Phrasea/Controller/Admin/Databox.php b/lib/Alchemy/Phrasea/Controller/Admin/Databox.php
index 88ce050ccd..05dd45112c 100644
--- a/lib/Alchemy/Phrasea/Controller/Admin/Databox.php
+++ b/lib/Alchemy/Phrasea/Controller/Admin/Databox.php
@@ -875,15 +875,19 @@ class Databox implements ControllerProviderInterface
         try {
             $databox = $app['phraseanet.appbox']->get_databox($databox_id);
 
-            foreach ($databox->get_collections() as $collection) {
-                if ($collection->get_record_amount() <= 500) {
-                    $collection->empty_collection(500);
-                    $msg = _('Base empty successful');
-                } else {
-                    $settings = "<?xml version=\"1.0\" encoding=\"UTF-8\"?><tasksettings><base_id>" . $collection->get_base_id() . "</base_id></tasksettings>";
-                    \task_abstract::create($app, 'task_period_emptyColl', $settings);
-                    $msg = _('A task has been creted, please run it to complete empty collection');
+            if (count($databox->get_collections()) > 0) {
+                foreach ($databox->get_collections() as $collection) {
+                    if ($collection->get_record_amount() <= 500) {
+                        $collection->empty_collection(500);
+                        $msg = _('Base empty successful');
+                    } else {
+                        $settings = "<?xml version=\"1.0\" encoding=\"UTF-8\"?><tasksettings><base_id>" . $collection->get_base_id() . "</base_id></tasksettings>";
+                        \task_abstract::create($app, 'task_period_emptyColl', $settings);
+                        $msg = _('A task has been creted, please run it to complete empty collection');
+                    }
                 }
+            } else  {
+                $msg = _('Base empty successful');
             }
 
             $success = true;
diff --git a/templates/web/admin/collection/collection.html.twig b/templates/web/admin/collection/collection.html.twig
index c612341e60..ff5b7fc993 100644
--- a/templates/web/admin/collection/collection.html.twig
+++ b/templates/web/admin/collection/collection.html.twig
@@ -108,7 +108,7 @@
     <form style="display:inline; margin:0 2px 0 0;" method="post" action="{{ path('admin_collection_rename', { 'bas_id' : bas_id }) }}" style="margin:0;">
         <div class="input-append" style="display:inline; margin:0;">
             <input name="name" class="span3" type="text" size="16">
-            <button class="btn reload-tree" type="submit">
+            <button class="btn reload-tree submiter" type="submit">
                 <img src="/skins/icons/edit_0.gif" />
                 {% trans 'admin::base:collection: renommer la collection' %}
             </button>
@@ -116,21 +116,21 @@
     </form>
 
     <form style="display:inline; margin:0;" method="post" action="{% if collection.is_active() %}{{ path('admin_collection_disable', { 'bas_id' : bas_id }) }}{% else %}{{ path('admin_collection_enable', { 'bas_id' : bas_id }) }}{% endif %}">
-        <button class="btn confirm" data-confirm-msg="{{ collection.is_active() ? 'admin::base:collection: etes vous sur darreter la publication de cette collection'|trans  : 'admin::base:collection: etes vous sur de publier cette collection ?'|trans }}">
+        <button class="btn confirm reload submiter" data-confirm-msg="{{ collection.is_active() ? 'admin::base:collection: etes vous sur darreter la publication de cette collection'|trans  : 'admin::base:collection: etes vous sur de publier cette collection ?'|trans }}">
             <img src="/skins/icons/db-remove.png"/>
             {{ collection.is_active() ? 'admin::base:collection: descativer la collection' | trans  : 'admin::base:collection: activer la collection'| trans }}
         </button>
     </form>
 
     <form style="display:inline; margin:0;" method="post" action="{{ path('admin_collection_empty', { 'bas_id' : bas_id }) }}">
-        <button class="btn confirm" data-confirm-msg="{% trans 'admin::base:collection: etes vous sur de vider la collection ?' %}">
+        <button class="btn confirm submiter" data-confirm-msg="{% trans 'admin::base:collection: etes vous sur de vider la collection ?' %}">
             <img src="/skins/icons/trash.png" />
             {% trans 'admin::base:collection: vider la collection' %}
         </button>
     </form>
 
     <form style="display:inline; margin:0;" method="post" action="{{ path('admin_collection_delete', { 'bas_id' : bas_id }) }}">
-        <button class="btn confirm" data-confirm-msg="{% trans 'admin::collection: Confirmez vous la suppression de cette collection ?' %}">
+        <button class="btn confirm submiter reload-tree" data-confirm-msg="{% trans 'admin::collection: Confirmez vous la suppression de cette collection ?' %}">
             <img src="/skins/icons/delete.gif" />
             {% trans 'boutton::supprimer' %}
         </button>
@@ -293,8 +293,11 @@
                 },
                 success: function(datas) {
                     if(datas.success) {
+                        alert(datas.msg);
                         if(submitLink.hasClass('reload')) {
-                            reloadTree('base:{{ collection.get_sbas_id() }}');
+                            reloadTree('base:{{ databox.get_sbas_id() }}', true);
+                        } else if(submitLink.hasClass('reload-tree')) {
+                            reloadTree('bases:bases', true);
                         }
                     } else {
                         alert(datas.msg);
diff --git a/templates/web/admin/databox/databox.html.twig b/templates/web/admin/databox/databox.html.twig
index 8fa13946dc..4e62b5ffb1 100644
--- a/templates/web/admin/databox/databox.html.twig
+++ b/templates/web/admin/databox/databox.html.twig
@@ -153,7 +153,7 @@
         </form>
 
          <form style="display:inline;" method="post" action="{{ path('admin_database_delete', {'databox_id': databox.get_sbas_id()}) }}">
-            <button type="button" class="btn submiter confirm" data-confirm-msg="{% trans 'admin::base: Confirmer la suppression de la base' %}">
+            <button type="button" class="btn submiter confirm reload-tree" data-confirm-msg="{% trans 'admin::base: Confirmer la suppression de la base' %}">
                 <img src="/skins/icons/delete.gif" />
                 {% trans "admin::base: supprimer la base" %}
             </button>
@@ -350,8 +350,11 @@
                 },
                 success: function(datas) {
                     if(datas.success) {
+                        alert(datas.msg);
                         if(submitLink.hasClass('reload')) {
-                            reloadTree('base:{{ databox.get_sbas_id() }}');
+                            reloadTree('base:{{ databox.get_sbas_id() }}', true);
+                        } else if(submitLink.hasClass('reload-tree')) {
+                            reloadTree('bases:bases', true);
                         }
                     } else {
                         alert(datas.msg);
@@ -365,8 +368,6 @@
 
         setTimeout("refreshDatabaseInformations();", 6000);
 
-
-
         $('#fileupload').fileupload({
             dataType: 'html',
             add: function(e, data) {