[#5050] Permettre la restauration d'objets supprimés

diff --git a/project/rh/templates/admin/rh/dossier/change_list.html b/project/rh/templates/admin/rh/dossier/change_list.html
index d18608e..f85e1ea 100644 (file)
--- a/project/rh/templates/admin/rh/dossier/change_list.html
+++ b/project/rh/templates/admin/rh/dossier/change_list.html
@@ -1,12 +1,19 @@
 {% extends "reversion/change_list.html" %}
-{% load change_list %}
+{% load change_list i18n %}
 
 {% block object-tools-items %}
-  <li>
-    <a href="add/{% if is_popup %}?_popup=1{% endif %}" class="addlink">
-        Ajouter Dossier
-    </a>
-  </li>
+<li>
+  <a href="{{recoverlist_url}}" class="recoverlink">
+    {% blocktrans with cl.opts.verbose_name_plural|escape as name %}
+    Récupérer dossiers supprimés
+    {% endblocktrans %}
+  </a>
+</li>
+<li>
+  <a href="add/{% if is_popup %}?_popup=1{% endif %}" class="addlink">
+      Ajouter Dossier
+  </a>
+</li>
 {% endblock %}
 
 {% block search %}

diff --git a/project/templates/reversion/change_form.html b/project/templates/reversion/change_form.html
deleted file mode 100644 (file)
index f7610e1..0000000
--- a/project/templates/reversion/change_form.html
+++ /dev/null
@@ -1,68 +0,0 @@
-{% extends "admin/base_site.html" %}
-{% load i18n admin_modify adminmedia %}
-{% load url from future %}
-
-{% block extrahead %}{{ block.super }}
-{% url 'admin:jsi18n' as jsi18nurl %}
-<script type="text/javascript" src="{{ jsi18nurl|default:"../../../jsi18n/" }}"></script>
-{{ media }}
-{% endblock %}
-
-{% block extrastyle %}{{ block.super }}<link rel="stylesheet" type="text/css" href="{% admin_media_prefix %}css/forms.css" />{% endblock %}
-
-{% block coltype %}{% if ordered_objects %}colMS{% else %}colM{% endif %}{% endblock %}
-
-{% block bodyclass %}{{ opts.app_label }}-{{ opts.object_name.lower }} change-form{% endblock %}
-
-{% block breadcrumbs %}{% if not is_popup %}
-<div class="breadcrumbs">
-     <a href="../../../">{% trans "Home" %}</a> &rsaquo;
-     <a href="../../">{{ app_label|capfirst|escape }}</a> &rsaquo;
-     {% if has_change_permission %}<a href="../">{{ opts.verbose_name_plural|capfirst }}</a>{% else %}{{ opts.verbose_name_plural|capfirst }}{% endif %} &rsaquo;
-     {% if add %}{% trans "Add" %} {{ opts.verbose_name }}{% else %}{{ original|truncatewords:"18" }}{% endif %}
-</div>
-{% endif %}{% endblock %}
-
-{% block content %}<div id="content-main">
-{% block object-tools %}
-{% if change %}{% if not is_popup %}
-  <ul class="object-tools">
-    {% block object-tools-items %}
-    <li><a href="history/" class="historylink">{% trans "History" %}</a></li>
-    {% if has_absolute_url %}<li><a href="../../../r/{{ content_type_id }}/{{ object_id }}/" class="viewsitelink">{% trans "View on site" %}</a></li>{% endif%}
-    {% endblock %}
-  </ul>
-{% endif %}{% endif %}
-{% endblock %}
-<form {% if has_file_field %}enctype="multipart/form-data" {% endif %}action="{{ form_url }}" method="post" id="{{ opts.module_name }}_form">{% csrf_token %}{% block form_top %}{% endblock %}
-<div>
-{% if is_popup %}<input type="hidden" name="_popup" value="1" />{% endif %}
-{% if errors %}
-    <p class="errornote">
-    {% blocktrans count errors|length as counter %}Please correct the error below.{% plural %}Please correct the errors below.{% endblocktrans %}
-    </p>
-    {{ adminform.form.non_field_errors }}
-{% endif %}
-
-{% for fieldset in adminform %}
-  {% include "admin/includes/fieldset.html" %}
-{% endfor %}
-
-{% block after_field_sets %}{% endblock %}
-
-{% for inline_admin_formset in inline_admin_formsets %}
-    {% include inline_admin_formset.opts.template %}
-{% endfor %}
-
-{% block after_related_objects %}{% endblock %}
-
-{% if adminform and add %}
-   <script type="text/javascript">document.getElementById("{{ adminform.first_field.id_for_label }}").focus();</script>
-{% endif %}
-
-{# JavaScript for prepopulated fields #}
-{% prepopulated_fields_js %}
-
-</div>
-</form></div>
-{% endblock %}

diff --git a/project/templates/reversion/revision_form.html b/project/templates/reversion/revision_form.html
deleted file mode 100644 (file)
index b72d949..0000000
--- a/project/templates/reversion/revision_form.html
+++ /dev/null
@@ -1,24 +0,0 @@
-{% extends "reversion/change_form.html" %}
-{% load i18n %}
-
-
-{% block breadcrumbs %}
-       <div class="breadcrumbs">
-               <a href="{% url admin:index %}">{% trans "Home" %}</a> &rsaquo;
-               <a href="{% url admin:app_list app_label %}">{{app_label|capfirst|escape}}</a> &rsaquo; 
-               <a href="{{changelist_url}}">{{opts.verbose_name_plural|capfirst}}</a> &rsaquo;
-               <a href="{{change_url}}">{{original|truncatewords:"18"}}</a> &rsaquo;
-               <a href="../">{% trans "History" %}</a> &rsaquo;
-               {% blocktrans with opts.verbose_name as verbose_name %}Revert {{verbose_name}}{% endblocktrans %}
-       </div>
-{% endblock %}
-
-
-{% block content %}
-       {% with 1 as is_popup %}
-               {{block.super}}
-       {% endwith %}
-{% endblock %}
-
-
-