WIP: Ticketing - Forum functionality done

Author: phlinx

inyoka_theme_ubuntuusers/templates/overall.html

@@ -122,11 +122,11 @@ <h1><a href="/"><span>{{ SETTINGS.BASE_DOMAIN_NAME }}</span></a></h1>
             {% endif %}
           </ul>{# .navi_global #}
         {% endif %}
-        {% if USER.has_perm('forum.manage_reported_topic') or USER.has_perm('ikhaya.change_article') or USER.has_perm('portal.change_event') %}
+        {% if USER.has_perm('forum.manage_tickets_forum') or USER.has_perm('ikhaya.change_article') or USER.has_perm('portal.change_event') %}
           <div id="admin_menu">
             <div class="bar">
-              {% if USER.has_perm('forum.manage_reported_topic') %}
-                {{ macros.render_modnavi_li(_('Reported topics'), href('forum', 'reported_topics'), href('static', 'img/admin/report.png'), report_count) }}
+              {% if USER.has_perm('forum.manage_tickets_forum') %}
+                {{ macros.render_modnavi_li(_('Tickets'), href('portal', 'tickets', 'list'), href('static', 'img/admin/report.png'), ticket_count) }}
               {% endif %}
               {% if USER.has_perm('ikhaya.change_article') %}
                 {% set label = _('Article suggestions') %}

inyoka_theme_ubuntuusers/templates/portal/ticketlist.html

@@ -9,6 +9,7 @@
 #}
 
 {%- extends 'portal/overall.html' %}
+{% from 'macros.html' import render_form %}
 {% set BREADCRUMBS = [(_('Tickets'), href('portal', 'tickets/list'))] + BREADCRUMBS|d([]) %}
 
 {% block content %}
@@ -48,20 +49,45 @@
                     {{ element.reporting_time|datetime }}
                 </td>
                 <td>
-                    {{ element.reporter_comment }}
+                    {{ element.reporter_comment_rendered }}
                 </td>
             </tr>
             <tr>
                 <td>
                     {% if element.owning_user %}
-                        {% trans %}Owned by{% endtrans %} <a href="{{ element.owning_user|url }}">{{ element.owning_user.username }}</a><br>
+                        {% trans %}Owned by{% endtrans %} <a href="{{ element.owning_user|url }}">{{ element.owning_user.username }}</a>
+                        {% if element.owning_user == USER %}
+                            (<a href="../{{ element.id }}/disown">{% trans %}Release ownership{% endtrans %}</a>)
+                        {% endif %}
+                        <br>
                         {{ element.owned_time|datetime }}
                     {% else %}
-                        <a href="todo/take_over">{% trans %}Take ownership{% endtrans %}</a>
+                        <a href="../{{ element.id }}/own">{% trans %}Take ownership{% endtrans %}</a>
+                        {% if element.owned_time %}
+                            <br>
+                            {% trans %}Previously already owned at {% endtrans %}{{ element.owned_time|datetime }}
+                        {% endif %}
                     {% endif %}
                 </td>
                 <td>
-                    {{ element.owner_comment }}
+                    {% if element.owning_user == USER %}
+                        {% if owner_comment_form and edit_ticket_id==element.id %}
+                            <owner_comment_form id="owner_comment" method="post" action="" class="new_topic">
+                                {{ csrf_token() }}
+                                {{ render_form(owner_comment_form, ['owner_comment'], inline=true) }}<br>
+                                <input type="submit" value="{% trans %}Submit{% endtrans %}" />
+                            </owner_comment_form>
+                        {% else %}
+                            {% if element.owner_comment %}
+                                <a href="../{{ element.id }}/edit" class="action action_edit">{% trans %}Edit comment{% endtrans %}</a><br>
+                                {{ element.owner_comment_rendered }}
+                            {% else %}
+                                <a href="../{{ element.id }}/edit" class="action action_edit">{% trans %}Add comment{% endtrans %}</a><br>
+                            {% endif %}
+                        {% endif %}
+                    {% else %}
+                        {{ element.owner_comment_rendered }}
+                    {% endif %}
                 </td>
             </tr>
         {%- else %}
@@ -84,6 +110,12 @@
             {%- trans %}Subscribe to topic reports{% endtrans -%}
         </a>
         {%- endif %}
+        {%- if USER.has_perm('portal.change_ticketreason') %}
+        |
+        <a href="{{ href('portal', 'ticketreason', 'list') }}">
+            {%- trans %}Manage ticket reasons{% endtrans -%}
+        </a>
+        {%- endif %}
     </div>
 </form>
 {% endblock %}

inyoka_theme_ubuntuusers/templates/portal/ticketreason_list.html

@@ -15,7 +15,7 @@
 {% block content %}
     <h3>{% trans %}Ticket Reasons{% endtrans %}</h3>
 
-    {%- if USER.has_perm('auth.add_group') -%}
+    {%- if USER.has_perm('portal.change_ticketreason') -%}
     <p>
         <a href="{{ href('portal', 'ticketreason', 'new') }}">{% trans %}Create new ticket reason{% endtrans %}</a>.
     </p>
@@ -32,7 +32,7 @@ <h3>{% trans %}Ticket Reasons{% endtrans %}</h3>
             <td>{{ reason.id }}</td>
             <td>{{ reason.content_type }}</td>
             <td>{{ reason.reason }}
-                {%- if USER.has_perm('auth.change_group') -%}
+                {%- if USER.has_perm('portal.change_ticketreason') -%}
                     <a href="{{ href('portal', 'ticketreason', reason.id, 'edit') }}" class="admin_link"><img src="{{ href('static', 'img/ikhaya/category_edit.png') }}" /></a>
             </td>
             <td>