Fix issues with POST/GET arguments and the modal

core/views/manage/threshold/irc.py

@@ -438,12 +438,15 @@ class ThresholdIRCActionsRegistration(SuperUserRequiredMixin, APIView):
         if not updated["success"]:
             message = updated["reason"]
             message_class = "danger"
-
+        unreg = threshold.irc_get_unreg(net)
         context = {
-            "net": net,
+            "unreg": unreg,
             "message": message,
             "class": message_class,
         }
+        if net:
+            if net != "None":
+                context["net"] = net
         return render(request, template_name, context)
 
 
@@ -463,13 +466,19 @@ class ThresholdIRCActionsRegistrationAuth(SuperUserRequiredMixin, APIView):
         if not updated["success"]:
             message = updated["reason"]
             message_class = "danger"
-
+        if "net" in request.data:
+            net = request.data["net"]
+        else:
+            net = None
+        unreg = threshold.irc_get_unreg(net)
         context = {
+            "unreg": unreg,
             "message": message,
             "class": message_class,
         }
         if "net" in request.data:
-            context["net"] = request.data["net"]
+            if request.data["net"] != "None":
+                context["net"] = request.data["net"]
         return render(request, self.template_name, context)
 
 

core/views/ui/drilldown.py

@@ -96,6 +96,13 @@ def drilldown_search(request, return_context=False, template=None):
         context = {"sizes": sizes}
         return render(request, template_name, context)
 
+    tmp_post = request.POST.dict()
+    tmp_get = request.GET.dict()
+    tmp_post = {k: v for k, v in tmp_post.items() if v and not v == "None"}
+    tmp_get = {k: v for k, v in tmp_get.items() if v and not v == "None"}
+    query_params.update(tmp_post)
+    query_params.update(tmp_get)
+
     if "index" in query_params:
         if not request.user.is_superuser:
             message = "You can't use the index parameter"