diff --git a/TODO.md b/TODO.md index dafe7505..ea5a5e24 100644 --- a/TODO.md +++ b/TODO.md @@ -448,8 +448,6 @@ mkhomedir_helper or create ssh homes with bash.rc and such # show base and total desglosed -# CLOSE&DOWNLOAD doesn't redirect to anything, confusing for users - # Reverse lOgHistory order by date (lastest first) @@ -459,7 +457,6 @@ mkhomedir_helper or create ssh homes with bash.rc and such # POSTFIX web traffic monitor '": uid=" from=<%(user)s>' -# Mv .deleted make sure it works with nested destinations # Automatically re-run backends until success? only timedout executions? # TODO save serialized versions ob backendoperation.instance in order to allow backend reexecution of deleted objects diff --git a/orchestra/contrib/bills/actions.py b/orchestra/contrib/bills/actions.py index 083160f6..9a340921 100644 --- a/orchestra/contrib/bills/actions.py +++ b/orchestra/contrib/bills/actions.py @@ -89,7 +89,10 @@ def close_bills(modeladmin, request, queryset, action='close_bills'): 'formset': formset, 'obj': get_object_from_url(modeladmin, request), } - return render(request, 'admin/orchestra/generic_confirmation.html', context) + templete = 'admin/orchestra/generic_confirmation.html' + if action == 'close_send_download_bills': + template = 'admin/bills/bill/close_send_download_bills.html' + return render(request, template, context) close_bills.tool_description = _("Close") close_bills.url_name = 'close' diff --git a/orchestra/contrib/bills/templates/admin/bills/bill/close_send_download_bills.html b/orchestra/contrib/bills/templates/admin/bills/bill/close_send_download_bills.html new file mode 100644 index 00000000..f7e408e8 --- /dev/null +++ b/orchestra/contrib/bills/templates/admin/bills/bill/close_send_download_bills.html @@ -0,0 +1,61 @@ +{% extends "admin/orchestra/generic_confirmation.html" %} +{% load i18n l10n %} +{% load url from future %} +{% load admin_urls static utils %} + +{% block extrastyle %} +{{ block.super }} + +{% endblock %} + +{% block content %} +
+
+
+

{{ content_message | safe }}

+
    {{ display_objects | unordered_list }}
+
+
{% csrf_token %} + {% block form %} + {% if form %} +
+ {{ form.non_field_errors }} + {% for field in form %} +
+
+ {{ field.errors }} + {% if field|is_checkbox %} + {{ field }} + {% else %} + {{ field.label_tag }} {{ field }} + {% endif %} +

{{ field.help_text|safe }}

+
+
+ {% endfor %} +
+ {% endif %} + {% endblock %} + {% block formset %} + {% if formset %} + {{ formset.as_admin }} + {% endif %} + {% endblock %} +
+ {% for obj in queryset %} + + {% endfor %} + + + +
+
+{% endblock %}