From 30afe96fc08fe5fe4c5ec218ff611c69dbf3f57d Mon Sep 17 00:00:00 2001
From: Emanuel Schuetze <emanuel@intevation.de>
Date: Sun, 4 Sep 2011 19:07:45 +0200
Subject: [PATCH] AVersion fixes: Added reject confirm message. Style changes.

---
 .../application/templates/application/view.html      |  8 +++++---
 openslides/application/views.py                      | 12 +++++++-----
 2 files changed, 12 insertions(+), 8 deletions(-)

diff --git a/openslides/application/templates/application/view.html b/openslides/application/templates/application/view.html
index d3ab52fa6..879636c65 100644
--- a/openslides/application/templates/application/view.html
+++ b/openslides/application/templates/application/view.html
@@ -229,9 +229,10 @@
     {% if application.versions|length > 1 %}
     <h2>{% trans "Version History" %}:</h2>
 
-    <table class="table valigntop">
+    <table class="table valigntop" style="width: auto;">
     <tr>
-        <th>#</th>
+        <th></th>
+        <th>{% trans "Version" %}</th>
         <th>{% trans "Time" %}</th>
         <th>{% trans "Title" %}</th>
         <th>{% trans "Text" %}</th>
@@ -240,7 +241,7 @@
     </tr>
     {% for revision in application.versions  %}
     <tr class="{% cycle 'odd' '' %}">
-        <td>{{ revision.aid }}
+        <td style="white-space:nowrap;">
         {% if application.status != "pub" %}
         {% if revision == application.permitted %}
              <img title="{%trans 'Version accepted' %}" src="/static/images/icons/task-accepted.png">
@@ -257,6 +258,7 @@
         {% endif %}
         {% endif %}
         </td>
+        <td>{{ revision.aid }}</td>
         <td><i>{{ revision.time }}</i></td>
         <td>
             {% ifchanged %}
diff --git a/openslides/application/views.py b/openslides/application/views.py
index b0f9f1961..24f689a56 100644
--- a/openslides/application/views.py
+++ b/openslides/application/views.py
@@ -362,7 +362,6 @@ def view_poll(request, poll_id):
 def permit_version(request, aversion_id):
     aversion = AVersion.objects.get(pk=aversion_id)
     application = aversion.application
-    
     if request.method == 'POST':
         application.accept_version(aversion)
         messages.success(request, _("Version <b>%s</b> accepted.") % (aversion.aid))
@@ -374,10 +373,13 @@ def permit_version(request, aversion_id):
 @permission_required('application.can_manage_application')
 def reject_version(request, aversion_id):
     aversion = AVersion.objects.get(pk=aversion_id)
-    application = aversion.application
-    if application.reject_version(aversion):
-        messages.success(request, _("Version rejected") )
+    application = aversion.application    
+    if request.method == 'POST':
+        if application.reject_version(aversion):
+            messages.success(request, _("Version <b>%s</b> rejected.") % (aversion.aid))
+        else:
+            messages.error(request, _("ERROR by rejecting the version.") )
     else:
-        messages.error(request, _("ERROR by rejecting the Version") )
+        gen_confirm_form(request, _('Do you really want to reject version <b>%s</b>?') % aversion.aid, reverse('application_version_reject', args=[aversion.id]))
     return redirect(reverse('application_view', args=[application.id]))