From dbb12bc8ff97eec35c27f92d29b9f45b46e9d8bf Mon Sep 17 00:00:00 2001
From: Mark Veidemanis <m@zm.is>
Date: Sun, 14 Aug 2022 23:59:02 +0100
Subject: [PATCH] Fix passing registration status to modal

---
 .../irc/network/modals/registration.html      | 20 +++++----
 core/templatetags/urlsafe.py                  |  1 +
 core/views/manage/threshold/irc.py            | 43 ++++++++++++++-----
 3 files changed, 46 insertions(+), 18 deletions(-)

diff --git a/core/templates/manage/threshold/irc/network/modals/registration.html b/core/templates/manage/threshold/irc/network/modals/registration.html
index af3b99c..b6e845f 100644
--- a/core/templates/manage/threshold/irc/network/modals/registration.html
+++ b/core/templates/manage/threshold/irc/network/modals/registration.html
@@ -52,7 +52,7 @@
           </span>
         </button>
       </div>
-      {% if unreg %}
+      {% if unreg is not None %}
         <form
           hx-headers='{"X-CSRFToken": "{{ csrf_token }}"}'
           hx-put="{% url 'threshold_irc_actions_registration_net' net %}"
@@ -60,14 +60,18 @@
           hx-swap="outerHTML">
           {% for network, items in unreg.items %}
             <h4 class="title is-4">{{ network }}</h4>
-            {% for nick, num in items %}
-              <div class="field">
-                <label class="label">{{ nick }}/{{ num }}</label>
-                <div class="control">
-                  <input class="input" type="text" name="{{ network }}|{{ num }}" placeholder="Enter token">
+            {% if items is not False %}
+              {% for nick, num in items %}
+                <div class="field">
+                  <label class="label">{{ nick }}/{{ num }}</label>
+                  <div class="control">
+                    <input class="input" type="text" name="{{ network }}|{{ num }}" placeholder="Enter token">
+                  </div>
                 </div>
-              </div>
-            {% endfor %}
+              {% endfor %}
+            {% else %}
+              <p>Error getting information for {{ network }}.</p>
+            {% endif %}
           {% endfor %}
           <button
             type="button"
diff --git a/core/templatetags/urlsafe.py b/core/templatetags/urlsafe.py
index 602d997..c673475 100644
--- a/core/templatetags/urlsafe.py
+++ b/core/templatetags/urlsafe.py
@@ -1,4 +1,5 @@
 import urllib.parse
+
 from django import template
 
 register = template.Library()
diff --git a/core/views/manage/threshold/irc.py b/core/views/manage/threshold/irc.py
index c59fb54..e4efdd3 100644
--- a/core/views/manage/threshold/irc.py
+++ b/core/views/manage/threshold/irc.py
@@ -418,7 +418,7 @@ class ThresholdIRCActionsRegistration(SuperUserRequiredMixin, APIView):
             "message": message,
             "class": message_class,
         }
-        if not message_class == "danger":
+        if "unreg" in unreg:
             context["unreg"] = unreg["unreg"]
         return render(request, self.template_name, context)
 
@@ -426,6 +426,8 @@ class ThresholdIRCActionsRegistration(SuperUserRequiredMixin, APIView):
         """
         Confirm registration for networks.
         """
+        message = None
+        message_class = None
         if request.resolver_match.url_name == "threshold_irc_actions_registration_net":
             template_name = "manage/threshold/irc/network/actions.html"
         else:
@@ -439,14 +441,23 @@ class ThresholdIRCActionsRegistration(SuperUserRequiredMixin, APIView):
             message = updated["reason"]
             message_class = "danger"
         unreg = threshold.irc_get_unreg(net)
+        if not unreg:
+            message = "Could not get registration status."
+            message_class = "danger"
+        elif not unreg["success"]:
+            if "reason" in unreg:
+                message = unreg["reason"]
+                message_class = "danger"
+            else:
+                message = "Getting registration status failed."
+                message_class = "danger"
         context = {
-            "unreg": unreg,
+            "net": net,
             "message": message,
             "class": message_class,
         }
-        if net:
-            if net != "None":
-                context["net"] = net
+        if "unreg" in unreg:
+            context["unreg"] = unreg["unreg"]
         return render(request, template_name, context)
 
 
@@ -467,18 +478,30 @@ class ThresholdIRCActionsRegistrationAuth(SuperUserRequiredMixin, APIView):
             message = updated["reason"]
             message_class = "danger"
         if "net" in request.data:
-            net = request.data["net"]
+            if request.data["net"] != "None":
+                net = request.data["net"]
+            else:
+                net = None
         else:
             net = None
         unreg = threshold.irc_get_unreg(net)
+        if not unreg:
+            message = "Could not get registration status."
+            message_class = "danger"
+        elif not unreg["success"]:
+            if "reason" in unreg:
+                message = unreg["reason"]
+                message_class = "danger"
+            else:
+                message = "Getting registration status failed."
+                message_class = "danger"
         context = {
-            "unreg": unreg,
+            "net": net,
             "message": message,
             "class": message_class,
         }
-        if "net" in request.data:
-            if request.data["net"] != "None":
-                context["net"] = request.data["net"]
+        if "unreg" in unreg:
+            context["unreg"] = unreg["unreg"]
         return render(request, self.template_name, context)