From 9e5088d49e0c46892c5339357f1394085ba37045 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Norman=20J=C3=A4ckel?= <my-git-mail@normanjaeckel.de>
Date: Thu, 30 May 2013 01:17:24 +0200
Subject: [PATCH] Fixed #683

---
 openslides/agenda/templates/agenda/view.html |  2 +-
 tests/agenda/models.py                       |  4 ++++
 tests/agenda/tests.py                        | 10 ++++++++++
 3 files changed, 15 insertions(+), 1 deletion(-)

diff --git a/openslides/agenda/templates/agenda/view.html b/openslides/agenda/templates/agenda/view.html
index 5db1cc341..c345a2fb3 100644
--- a/openslides/agenda/templates/agenda/view.html
+++ b/openslides/agenda/templates/agenda/view.html
@@ -43,7 +43,7 @@
     </small>
 </h1>
 <p>
-    {% if item.get_related_slide == item %}
+    {% if not item.related_sid %}
         {{ item.text|safe|linebreaks }}
     {% else %}
         <a href="{% model_url item.get_related_slide %}" class="btn btn-small">{% trans 'View' %} "{{ item.get_related_slide }}" ({% trans item.get_related_type %})</a>
diff --git a/tests/agenda/models.py b/tests/agenda/models.py
index f61694356..bee6a250f 100644
--- a/tests/agenda/models.py
+++ b/tests/agenda/models.py
@@ -15,4 +15,8 @@ class ReleatedItem(SlideMixin, models.Model):
     def get_agenda_title_supplement(self):
         return 'test item'
 
+    def get_absolute_url(self, *args, **kwargs):
+        return '/absolute-url-here/'
+
+
 register_slidemodel(ReleatedItem)
diff --git a/tests/agenda/tests.py b/tests/agenda/tests.py
index 28d1f4391..77fcbbc8c 100644
--- a/tests/agenda/tests.py
+++ b/tests/agenda/tests.py
@@ -192,6 +192,16 @@ class ViewTest(TestCase):
         self.refreshItems()
         self.assertEqual(self.item1.title, 'newitem1')
 
+    def test_view(self):
+        item = Item.objects.create(title='quai5OTeephaequ0xei0')
+        c = self.adminClient
+        response = c.get('/agenda/%s/' % item.id)
+        self.assertContains(response, 'quai5OTeephaequ0xei0')
+        self.assertTemplateUsed(response, 'agenda/view.html')
+        # Test it twice for former error in the template
+        response = c.get('/agenda/%s/' % item.id)
+        self.assertContains(response, 'quai5OTeephaequ0xei0')
+
 
 class ConfigTest(TestCase):
     def setUp(self):