Commit 71f9e359 authored by Skia's avatar Skia

Merge branch 'forum' into 'master'

Remove ambiguity for topic creation in a category

See merge request !85
parents 58dc1791 7515e826
Pipeline #1078 passed with stage
in 4 minutes and 45 seconds
......@@ -19,7 +19,9 @@
{% if user.is_in_group(settings.SITH_GROUP_FORUM_ADMIN_ID) or user.is_in_group(settings.SITH_GROUP_COM_ADMIN_ID) %}
<a href="{{ url('forum:new_forum') }}?parent={{ forum.id }}">{% trans %}New forum{% endtrans %}</a> <br/>
{% endif %}
{% if not forum.is_category %}
<a href="{{ url('forum:new_topic', forum_id=forum.id) }}">{% trans %}New topic{% endtrans %}</a>
{% endif %}
</p>
{% if forum.children.exists() %}
<div>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment