Move all helpdesk to automarkup

helpdesk/migrations/0010_auto_20190620_0817.py

+# Generated by Django 2.1.8 on 2019-06-20 06:17
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('helpdesk', '0009_auto_20190317_0917'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='queue',
+            name='description',
+            field=models.TextField(help_text='You can use plain text, Markdown or reStructuredText; see our <a href="/markup/help/" target="_blank">markup help</a> pages.'),
+        ),
+        migrations.AlterField(
+            model_name='ticket',
+            name='description',
+            field=models.TextField(help_text='You can use plain text, Markdown or reStructuredText; see our <a href="/markup/help/" target="_blank">markup help</a> pages.'),
+        ),
+    ]

helpdesk/models.py

@@ -34,7 +34,9 @@ class Queue(models.Model):
     """
     name = models.CharField(max_length=64)
     slug = models.SlugField(allow_unicode=True, unique=True)
-    description = models.TextField()
+    description = models.TextField(
+        help_text=('You can use plain text, Markdown or reStructuredText; see our '
+                   '<a href="/markup/help/" target="_blank">markup help</a> pages.'))
     managing_group = models.ForeignKey('auth.Group', on_delete=models.CASCADE,
                                        related_name='managed_queues')
     response_groups = models.ManyToManyField('auth.Group')
@@ -99,11 +101,8 @@ class Ticket(models.Model):
                                          'seems most appropriate for your issue'))
     title = models.CharField(max_length=64, default='')
     description = models.TextField(
-        help_text=(
-            'You can use ReStructuredText, see a '
-            '<a href="https://devguide.python.org/documenting/#restructuredtext-primer" '
-            'target="_blank">primer on python.org</a>')
-        )
+        help_text=('You can use plain text, Markdown or reStructuredText; see our '
+                   '<a href="/markup/help/" target="_blank">markup help</a> pages.'))
     publicly_visible = models.BooleanField(
         default=False,
         help_text=('Do you agree with this Ticket being made publicly visible '

helpdesk/templates/helpdesk/followup_form.html

 {% extends 'helpdesk/base.html' %}
 
 {% load bootstrap %}
-{% load restructuredtext %}
 
 
 {% block breadcrumb_items %}

helpdesk/templates/helpdesk/helpdesk.html

 {% extends 'helpdesk/base.html' %}
 
 {% load bootstrap %}
-{% load restructuredtext %}
-
 
 {% block breadcrumb_items %}
   {{ block.super }}

helpdesk/templates/helpdesk/queue_card.html

 {% load bootstrap %}
-{% load restructuredtext %}
+{% load automarkup %}
 
 <div class="card">
   <div class="card-header">
@@ -9,7 +9,7 @@
     </div>
   </div>
   <div class="card-body">
-    {{ queue.description|restructuredtext }}
+    {{ queue.description|automarkup }}
     {% if queue.sub_queues.all|length > 0 %}
       <hr/>
       <p>Sub-Queues:</p>

helpdesk/templates/helpdesk/queue_confirm_delete.html

 {% extends 'helpdesk/base.html' %}
 
 {% load bootstrap %}
-{% load restructuredtext %}
+{% load automarkup %}
 
 {% block pagetitle %}: Delete Queue{% endblock pagetitle %}
 
@@ -11,7 +11,7 @@
       <h1 class="highlight">Delete Queue {{ object.name }}</h1>
 
       <h3 class="highlight">Description</h3>
-      {{ object.description|restructuredtext }}
+      {{ object.description|automarkup }}
 
       <h3 class="highlight">Tickets</h3>
       {% include 'helpdesk/tickets_table.html' with queue=object %}

helpdesk/templates/helpdesk/queue_detail.html

@@ -2,7 +2,7 @@
 
 {% load bootstrap %}
 {% load guardian_tags %}
-{% load restructuredtext %}
+{% load automarkup %}
 
 {% block breadcrumb_items %}
   {{ block.super }}
@@ -85,7 +85,7 @@
       {% endif %}
 
       <h3 class="highlight">Description</h3>
-      {{ queue.description|restructuredtext }}
+      {{ queue.description|automarkup }}
 
       <h3 class="highlight">Tickets in this Queue</h3>
       {% include 'helpdesk/tickets_table.html' with tickets=queue.tickets.all %}

helpdesk/templates/helpdesk/ticket_confirm_delete.html

 {% extends 'helpdesk/base.html' %}
 
 {% load bootstrap %}
-{% load restructuredtext %}
 
 {% block pagetitle %}: Delete Ticket{% endblock pagetitle %}
 

helpdesk/templates/helpdesk/ticket_detail.html

@@ -2,7 +2,6 @@
 
 {% load bootstrap %}
 {% load guardian_tags %}
-{% load restructuredtext %}
 
 {% block breadcrumb_items %}
   {{ block.super }}