From 5d5e7c10f5b7993d08277188675586307041ba37 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Norman=20J=C3=A4ckel?= <hg@normanjaeckel.de>
Date: Mon, 16 Jul 2012 00:39:46 +0200
Subject: [PATCH] Change strings in agenda overview and agenda widget
 concerning application items

---
 openslides/agenda/templates/agenda/item_row.html | 11 +++++++++--
 openslides/agenda/templates/agenda/widget.html   | 12 +++++++++++-
 openslides/application/models.py                 |  2 +-
 3 files changed, 21 insertions(+), 4 deletions(-)

diff --git a/openslides/agenda/templates/agenda/item_row.html b/openslides/agenda/templates/agenda/item_row.html
index b7bfe29a2..a318fb96a 100644
--- a/openslides/agenda/templates/agenda/item_row.html
+++ b/openslides/agenda/templates/agenda/item_row.html
@@ -20,8 +20,15 @@
         {% if perms.agenda.can_manage_agenda %}
             <div class="dragcell"></div>
         {% endif %}
-        <a href="{{ item.get_absolute_url }}">{{ item }}</a>
-        {% if item.related_sid %}
+        <a href="{% model_url item 'view' %}">{{ item }}</a>
+        {% if item.get_related_type == 'application' %}
+            ({% trans 'Application' %}
+            {% if item.get_related_slide.number %}
+                {{ item.get_related_slide.number }})
+            {% else %}
+                <i>[{% trans "no number" %}]</i>)
+            {% endif %}
+        {% elif item.related_sid %}
             ({{ item.print_related_type }})
         {% endif %}
     </td>
diff --git a/openslides/agenda/templates/agenda/widget.html b/openslides/agenda/templates/agenda/widget.html
index 0df14acd9..18f6276c0 100644
--- a/openslides/agenda/templates/agenda/widget.html
+++ b/openslides/agenda/templates/agenda/widget.html
@@ -39,7 +39,17 @@
         {% for p in item.get_ancestors %}
             <span class="indentation">&nbsp;</span>
         {% endfor %}
-        <a href="{% model_url item 'view' %}">{{ item }}</a>{% if item.related_sid %} ({{ item.print_related_type }}){% endif %}
+        <a href="{% model_url item 'view' %}">{{ item }}</a>
+        {% if item.get_related_type == 'application' %}
+            ({% trans 'Application' %}
+            {% if item.get_related_slide.number %}
+                {{ item.get_related_slide.number }})
+            {% else %}
+                <i>[{% trans "no number" %}]</i>)
+            {% endif %}
+        {% elif item.related_sid %}
+            ({{ item.print_related_type }})
+        {% endif %}
     </li>
 {% empty %}
     <li>{% trans 'No items available.' %}</li>
diff --git a/openslides/application/models.py b/openslides/application/models.py
index cc585f231..a3cd3e2f0 100644
--- a/openslides/application/models.py
+++ b/openslides/application/models.py
@@ -434,7 +434,7 @@ class Application(models.Model, SlideMixin):
         self.save()
 
     def get_agenda_title(self):
-        return self.title
+        return self.public_version.title
 
     def __getattr__(self, name):
         """