Skip to content

Commit fe3a387

Browse files
committed
WIP: unify topic and post ticket creation, show open as well as all ticket in top bar
1 parent 97d9073 commit fe3a387

File tree

5 files changed

+871
-903
lines changed

5 files changed

+871
-903
lines changed

inyoka_theme_ubuntuusers/templates/forum/ticket_post.html renamed to inyoka_theme_ubuntuusers/templates/forum/ticket.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
(post.id, post|url)] + BREADCRUMBS|d([]) %}
1616

1717
{% block content %}
18-
<form id="create_ticket_post" method="post" action="" class="new_topic">
18+
<form id="create_ticket" method="post" action="" class="new_topic">
1919
{{ csrf_token() }}
2020
<h2>{% trans post=post.id|e %}Report post “{{ post }}”{% endtrans %}</h2>
2121
<p>

inyoka_theme_ubuntuusers/templates/forum/ticket_topic.html

Lines changed: 0 additions & 32 deletions
This file was deleted.

inyoka_theme_ubuntuusers/templates/forum/topic.html

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -63,8 +63,6 @@
6363
id="{{ topic.slug }}">{% trans %}Mark as solved{% endtrans %}</a>
6464
{% endif %} |
6565
{% endif %}
66-
<a href="{{ topic|url('ticket') }}"
67-
class="action action_report">{% trans %}Report{% endtrans %}</a>
6866
{% endif %}
6967
</span>
7068
{%- if can_moderate %}

inyoka_theme_ubuntuusers/templates/portal/ticketreason_list.html

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,10 +32,12 @@ <h3>{% trans %}Ticket Reasons{% endtrans %}</h3>
3232
<td>{{ reason.id }}</td>
3333
<td>{{ reason.content_type }}</td>
3434
<td>{{ reason.reason }}
35-
{%- if USER.has_perm('portal.change_ticketreason') -%}
35+
{%- if USER.has_perm('portal.change_ticketreason') and not reason.system_defined -%}
3636
<a href="{{ href('portal', 'ticketreason', reason.id, 'edit') }}" class="admin_link"><img src="{{ href('static', 'img/ikhaya/category_edit.png') }}" /></a>
37+
{%- endif -%}
3738
</td>
3839
<td>
40+
{%- if USER.has_perm('portal.change_ticketreason') and not reason.system_defined -%}
3941
<a href="{{ href('portal', 'ticketreason', reason.id, 'delete') }}" class="admin_link"><img src="{{ href('static', 'img/forum/delete.png') }}" /></a>
4042
{%- endif -%}
4143
</td>

0 commit comments

Comments
 (0)