changed redirect_to_current_compterendu view to use Maraude manager's

get_in_progress(), which is now a method instead of cache property.
+ better display of admin panel's buttons in sujets detail views
This commit is contained in:
artus40
2017-08-28 17:35:56 +02:00
parent 67a04f1c18
commit 0d3798f087
5 changed files with 24 additions and 24 deletions

View File

@@ -89,13 +89,13 @@
{% block sidebar %}
{{ block.super }}
<hr />
{% if user.is_superuser %}
<hr />
<div class="panel panel-primary text-right"><div class="panel-heading"><h4 class="panel-title"><strong>Administration :</strong></h4></div>
<div class="panel-body">
<div class="btn-group" role="group" aria-label="...">
<a href="{% url 'admin:notes_note_changelist' %}?sujet__exact={{sujet.pk}}" class="btn btn-primary">{% bootstrap_icon "wrench" %} Éditer les notes</a>
<a href="{% url 'notes:sujets-merge' pk=object.pk %}" class="btn btn-default">{% bootstrap_icon "paste" %} Fusionner</a>
<div class="panel-body text-center">
<div class="btn-group-vertical" role="group" aria-label="...">
<a href="{% url 'admin:notes_note_changelist' %}?sujet__exact={{sujet.pk}}" class="btn btn-primary">{% bootstrap_icon "pencil" %} Éditer les notes</a>
<a href="{% url 'notes:sujets-merge' pk=object.pk %}" class="btn btn-danger">{% bootstrap_icon "paste" %} Fusionner</a>
</div>
</div>
</div>