XF/neptune
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fix passing registration status to modal

Browse Source
This commit is contained in:
Mark Veidemanis
2022-08-14 23:59:02 +01:00
parent bfd9c03c82
commit dbb12bc8ff
3 changed files with 46 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

43
core/views/manage/threshold/irc.py
View File

@@ -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)