Merge bugfixes from 'upstream/master'

helpdesk/migrations/0019_ticket_secret_key.py

@@ -8,20 +8,22 @@ def clear_secret_keys(apps, schema_editor):
     db_alias = schema_editor.connection.alias
 
     for ticket in Ticket.objects.using(db_alias).all():
-         ticket.secret_key=''
-         ticket.save()
+        ticket.secret_key = ''
+        ticket.save()
+
 
 class Migration(migrations.Migration):
 
     dependencies = [
-        ('helpdesk', '0018_fix_migrations'),
+        ('helpdesk', '0018_ticket_secret_key'),
     ]
 
     operations = [
         migrations.AddField(
             model_name='ticket',
             name='secret_key',
-            field=models.CharField(default=helpdesk.models.mk_secret, max_length=36, verbose_name='Secret key needed for viewing/editing ticket by non-logged in users'),
+            field=models.CharField(default=helpdesk.models.mk_secret, max_length=36,
+                                   verbose_name='Secret key needed for viewing/editing ticket by non-logged in users'),
         ),
         migrations.RunPython(clear_secret_keys),
     ]

helpdesk/migrations/0034_create_email_template_for_merged.py

@@ -7,6 +7,7 @@ def forwards_func(apps, schema_editor):
     EmailTemplate = apps.get_model("helpdesk", "EmailTemplate")
     db_alias = schema_editor.connection.alias
     EmailTemplate.objects.using(db_alias).create(
+        id=EmailTemplate.objects.order_by('-id').first().id + 1,  # because PG sequences are not reset
         template_name='merged',
         subject='(Merged)',
         heading='Ticket merged',
@@ -23,6 +24,7 @@ def forwards_func(apps, schema_editor):
         locale='en'
     )
     EmailTemplate.objects.using(db_alias).create(
+        id=EmailTemplate.objects.order_by('-id').first().id + 1,  # because PG sequences are not reset
         template_name='merged',
         subject='(Fusionné)',
         heading='Ticket Fusionné',
@@ -32,7 +34,7 @@ def forwards_func(apps, schema_editor):
 
 Veillez à répondre sur ce ticket dorénavant, ou bien inclure la balise {{ ticket.merged_to.ticket }} dans le sujet de votre réponse par mail.""",
         html="""<p style="font-family: sans-serif; font-size: 1em;">Bonjour,</p>
-        
+
 <p style="font-family: sans-serif; font-size: 1em;">Ce courriel indicatif permet de vous prévenir que le ticket <b>{{ ticket.ticket }}</b> (<em>{{ ticket.title }}</em>) par {{ ticket.submitter_email }}  a été fusionné au ticket <a href="{{ ticket.merged_to.staff_url }}">{{ ticket.merged_to.ticket }}</a>.</p>
 
 <p style="font-family: sans-serif; font-size: 1em;">Veillez à répondre sur ce ticket dorénavant, ou bien inclure la balise <b>{{ ticket.merged_to.ticket }}</b> dans le sujet de votre réponse par mail.</p>""",

helpdesk/static/helpdesk/filter.js

@@ -1,24 +1,24 @@
 $(document).ready(function() {
     $("#filterBuilderButton").click(function() {
-        var boxName = "#filterBox" + $("#filterBuilderSelect").val();
+        const boxName = "#filterBox" + $("#filterBuilderSelect").val();
         $(boxName).slideDown();
         return false;
     });
     $(".filterBuilderRemove").click(function() {
-        var boxName = "#" + $(this).parents(".filterBox").attr('id');
+        const boxName = "#" + $(this).parents(".filterBox").attr('id');
         $(boxName).slideUp();
-        $(boxName).children("input:text").each(function() {
+        $(boxName).find("input:text").each(function() {
             $(this).val("");
         });
-        $(boxName).children("input:checkbox").each(function() {
+        $(boxName).find("input:checkbox").each(function() {
             this.checked = false;
         });
-        $(boxName).children("select").each(function() {
+        $(boxName).find("select").each(function() {
             this.selectedIndex = -1;
         });
 
-        var selectId = $(this).parents(".filterBox").attr('id');
-        var attr = selectId.replace("filterBox", "");
+        let selectId = $(this).parents(".filterBox").attr('id');
+        const attr = selectId.replace("filterBox", "");
         $("#filterBuilderSelect-" + attr)[0].disabled = "";
 
         return false;
@@ -31,9 +31,9 @@ $(document).ready(function() {
  *
  * @param {string} val name of selected filter value
  */
-var onFilterChange = function(val) {
+const onFilterChange = function(val) {
   if (val) {
-    var boxName = "#filterBox" + val;
+    const boxName = "#filterBox" + val;
     $(boxName).slideDown();
     $(boxName)[0].style.display="block";