#315 remove application from agenda by appending a new methode get_application_title_supplement

openslides/agenda/models.py

@@ -18,7 +18,7 @@ except ImportError:
 
 from django.db import models
 from django.core.urlresolvers import reverse
-from django.utils.translation import ugettext_lazy as _, ugettext_noop
+from django.utils.translation import ugettext_lazy as _, ugettext_noop, ugettext
 
 from mptt.models import MPTTModel, TreeForeignKey
 
@@ -67,7 +67,7 @@ class Item(MPTTModel, SlideMixin):
         For use in Template
         ??Why does {% trans item.print_related_type|capfirst %} not work??
         """
-        return _(self.get_related_type().capitalize())
+        return ugettext(self.get_related_type().capitalize())
 
     def get_title(self):
         """
@@ -77,6 +77,18 @@ class Item(MPTTModel, SlideMixin):
             return self.title
         return self.get_related_slide().get_agenda_title()
 
+
+    def get_title_supplement(self):
+        """
+        return a supplement for the title.
+        """
+        if self.related_sid is None:
+            return ''
+        try:
+            return self.get_related_slide().get_agenda_title_supplement()
+        except AttributeError:
+            return '(%s)' % self.print_related_type()
+
     def slide(self):
         """
         Return a map with all Data for the Slide

openslides/agenda/templates/agenda/item_row.html

@@ -21,16 +21,7 @@
             <div class="dragcell"></div>
         {% 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 %}
+        {{ item.get_title_supplement|safe }}
     </td>
     {% if perms.agenda.can_manage_agenda %}
     <td>

openslides/application/models.py

@@ -18,7 +18,7 @@ from django.db import models
 from django.db.models import Max
 from django.dispatch import receiver
 from django.utils.translation import pgettext
-from django.utils.translation import ugettext_lazy as _, ugettext_noop
+from django.utils.translation import ugettext_lazy as _, ugettext_noop, ugettext
 
 from openslides.utils.utils import _propper_unicode
 
@@ -436,6 +436,10 @@ class Application(models.Model, SlideMixin):
     def get_agenda_title(self):
         return self.public_version.title
 
+    def get_agenda_title_supplement(self):
+        number = self.number or '<i>[%s]</i>' % ugettext('no number')
+        return '(%s %s)' % (ugettext('Application'), number)
+
     def __getattr__(self, name):
         """
         if name is title, text, reason or time,