Merge branch 'forum' into 'master'

Remove ambiguity for topic creation in a category

See merge request !85
This commit is contained in:
Skia 2017-06-14 08:35:17 +02:00
commit 71f9e359c0

View File

@ -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) %} {% 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/> <a href="{{ url('forum:new_forum') }}?parent={{ forum.id }}">{% trans %}New forum{% endtrans %}</a> <br/>
{% endif %} {% endif %}
{% if not forum.is_category %}
<a href="{{ url('forum:new_topic', forum_id=forum.id) }}">{% trans %}New topic{% endtrans %}</a> <a href="{{ url('forum:new_topic', forum_id=forum.id) }}">{% trans %}New topic{% endtrans %}</a>
{% endif %}
</p> </p>
{% if forum.children.exists() %} {% if forum.children.exists() %}
<div> <div>