entrouvert
/
chrono
14
1
Fork 0
Code Issues Pull Requests 5 Releases Wiki Activity

manager: display agenda slug on listing (#47003)

This commit is contained in:
Lauréline Guérin 2020-09-25 11:24:24 +02:00
parent 41ac7dd817
commit c7d442f97a
No known key found for this signature in database
GPG Key ID: 1FAB9B9B4F93D473
2 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
chrono/manager/templates/chrono/manager_home.html
View File

@ -22,7 +22,7 @@
{% if group.grouper %}<h3>{{ group.grouper }}</h3>{% elif not forloop.first %}<h3>{% trans "Misc" %}</h3>{% endif %}
<ul class="objects-list single-links">
{% for object in group.list %}
<li><a href="{% url 'chrono-manager-agenda-view' pk=object.id %}"><span class="badge">{{ object.get_kind_display }}</span> {{ object.label }}</a></li>
<li><a href="{% url 'chrono-manager-agenda-view' pk=object.id %}"><span class="badge">{{ object.get_kind_display }}</span> {{ object.label }}{% if user.is_staff %} <span class="identifier">[{% trans "identifier:" %} {{ object.slug }}]{% endif %}</span></a></li>
{% endfor %}
</ul>
</div>

11
tests/test_manager.py
View File

@ -230,7 +230,15 @@ def test_virtual_agenda_redirect(app, admin_user):
agenda = Agenda.objects.create(label=u'Foo Bar', kind='virtual')
app = login(app)
resp = app.get('/manage/agendas/%s/' % agenda.pk) # no redirection
app.get('/manage/agendas/%s/' % agenda.pk) # no redirection
def test_view_agendas_as_admin(app, admin_user):
Agenda.objects.create(label=u'Bar Foo')
app = login(app)
resp = app.get('/manage/', status=200)
assert 'Bar Foo <span class="identifier">[identifier: bar-foo]</span>' in resp.text
def test_view_agendas_as_manager(app, manager_user):
@ -244,6 +252,7 @@ def test_view_agendas_as_manager(app, manager_user):
app = login(app, username='manager', password='manager')
resp = app.get('/manage/', status=200)
assert 'Foo Bar' in resp.text
assert 'Bar Foo <span class="identifier">[identifier: bar-foo]</span>' not in resp.text
assert 'Bar Foo' not in resp.text
assert 'New' not in resp.text