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

Fix #1327 & #1326 Can not delete or empty collection

Browse Source
This commit is contained in:
Nicolas Le Goff
2013-07-31 14:36:13 +02:00
parent 146679887d
commit bfffa8de60
3 changed files with 25 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
lib/Alchemy/Phrasea/Controller/Admin/Databox.php
View File

@@ -875,15 +875,19 @@ class Databox implements ControllerProviderInterface
try { try {
$databox = $app['phraseanet.appbox']->get_databox($databox_id); $databox = $app['phraseanet.appbox']->get_databox($databox_id);
foreach ($databox->get_collections() as $collection) { if (count($databox->get_collections()) > 0) {
if ($collection->get_record_amount() <= 500) { foreach ($databox->get_collections() as $collection) {
$collection->empty_collection(500); if ($collection->get_record_amount() <= 500) {
$msg = _('Base empty successful'); $collection->empty_collection(500);
} else { $msg = _('Base empty successful');
$settings = "<?xml version=\"1.0\" encoding=\"UTF-8\"?><tasksettings><base_id>" . $collection->get_base_id() . "</base_id></tasksettings>"; } else {
\task_abstract::create($app, 'task_period_emptyColl', $settings); $settings = "<?xml version=\"1.0\" encoding=\"UTF-8\"?><tasksettings><base_id>" . $collection->get_base_id() . "</base_id></tasksettings>";
$msg = _('A task has been creted, please run it to complete empty collection'); \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; $success = true;

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

@@ -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;"> <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;"> <div class="input-append" style="display:inline; margin:0;">
<input name="name" class="span3" type="text" size="16"> <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" /> <img src="/skins/icons/edit_0.gif" />
{% trans 'admin::base:collection: renommer la collection' %} {% trans 'admin::base:collection: renommer la collection' %}
</button> </button>
@@ -116,21 +116,21 @@
</form> </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 %}"> <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"/> <img src="/skins/icons/db-remove.png"/>
{{ collection.is_active() ? 'admin::base:collection: descativer la collection' | trans : 'admin::base:collection: activer la collection'| trans }} {{ collection.is_active() ? 'admin::base:collection: descativer la collection' | trans : 'admin::base:collection: activer la collection'| trans }}
</button> </button>
</form> </form>
<form style="display:inline; margin:0;" method="post" action="{{ path('admin_collection_empty', { 'bas_id' : bas_id }) }}"> <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" /> <img src="/skins/icons/trash.png" />
{% trans 'admin::base:collection: vider la collection' %} {% trans 'admin::base:collection: vider la collection' %}
</button> </button>
</form> </form>
<form style="display:inline; margin:0;" method="post" action="{{ path('admin_collection_delete', { 'bas_id' : bas_id }) }}"> <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" /> <img src="/skins/icons/delete.gif" />
{% trans 'boutton::supprimer' %} {% trans 'boutton::supprimer' %}
</button> </button>
@@ -293,8 +293,11 @@
}, },
success: function(datas) { success: function(datas) {
if(datas.success) { if(datas.success) {
alert(datas.msg);
if(submitLink.hasClass('reload')) { 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 { } else {
alert(datas.msg); alert(datas.msg);

9
templates/web/admin/databox/databox.html.twig
View File

@@ -153,7 +153,7 @@
</form> </form>
<form style="display:inline;" method="post" action="{{ path('admin_database_delete', {'databox_id': databox.get_sbas_id()}) }}"> <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" /> <img src="/skins/icons/delete.gif" />
{% trans "admin::base: supprimer la base" %} {% trans "admin::base: supprimer la base" %}
</button> </button>
@@ -350,8 +350,11 @@
}, },
success: function(datas) { success: function(datas) {
if(datas.success) { if(datas.success) {
alert(datas.msg);
if(submitLink.hasClass('reload')) { 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 { } else {
alert(datas.msg); alert(datas.msg);
@@ -365,8 +368,6 @@
setTimeout("refreshDatabaseInformations();", 6000); setTimeout("refreshDatabaseInformations();", 6000);
$('#fileupload').fileupload({ $('#fileupload').fileupload({
dataType: 'html', dataType: 'html',
add: function(e, data) { add: function(e, data) {