ag-admin/OpenSlides
0
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Change strings in agenda overview and agenda widget concerning application items

Browse Source
This commit is contained in:
Norman Jäckel 2012-07-16 00:39:46 +02:00
parent 16e829a05d
commit 5d5e7c10f5
3 changed files with 21 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
openslides/agenda/templates/agenda/item_row.html
View File

@ -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>

12
openslides/agenda/templates/agenda/widget.html
View File

@ -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>

2
openslides/application/models.py
View File

@ -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):
"""