From dc95d563979b8adaf5340cdcd8e29e9740a4adb6 Mon Sep 17 00:00:00 2001 From: Michael Elkins Date: Thu, 27 Jun 2013 17:05:53 +0000 Subject: add button to delete all alerts rpkigui-reset-demo will clear all alerts for labuser* accounts see #562 svn path=/trunk/; revision=5421 --- rpkid/portal-gui/scripts/rpkigui-reset-demo.py | 3 ++- rpkid/rpki/gui/app/models.py | 3 +++ .../gui/app/templates/app/alert_confirm_clear.html | 21 +++++++++++++++++++++ rpkid/rpki/gui/app/templates/app/alert_list.html | 5 +++++ rpkid/rpki/gui/app/urls.py | 1 + rpkid/rpki/gui/app/views.py | 14 ++++++++++++++ 6 files changed, 46 insertions(+), 1 deletion(-) create mode 100644 rpkid/rpki/gui/app/templates/app/alert_confirm_clear.html (limited to 'rpkid') diff --git a/rpkid/portal-gui/scripts/rpkigui-reset-demo.py b/rpkid/portal-gui/scripts/rpkigui-reset-demo.py index 3c5c11a1..e1ff6134 100644 --- a/rpkid/portal-gui/scripts/rpkigui-reset-demo.py +++ b/rpkid/portal-gui/scripts/rpkigui-reset-demo.py @@ -35,6 +35,7 @@ for n in xrange(1, 33): print 'removing objects for ' + username for cls in (ROARequest, GhostbusterRequest): cls.objects.filter(issuer__handle=username).delete() - print '... updating resource certificate cache' conf = Conf.objects.get(handle=username) + conf.clear_alerts() + print '... updating resource certificate cache' list_received_resources(sys.stdout, conf) diff --git a/rpkid/rpki/gui/app/models.py b/rpkid/rpki/gui/app/models.py index 5b33be5e..7d643fdc 100644 --- a/rpkid/rpki/gui/app/models.py +++ b/rpkid/rpki/gui/app/models.py @@ -197,6 +197,9 @@ class Conf(rpki.irdb.models.ResourceHolderCA): ) return notify_emails + def clear_alerts(self): + self.alerts.all().delete() + class Meta: proxy = True diff --git a/rpkid/rpki/gui/app/templates/app/alert_confirm_clear.html b/rpkid/rpki/gui/app/templates/app/alert_confirm_clear.html new file mode 100644 index 00000000..5d7fcf04 --- /dev/null +++ b/rpkid/rpki/gui/app/templates/app/alert_confirm_clear.html @@ -0,0 +1,21 @@ +{% extends "app/app_base.html" %} +{% load url from future %} + +{% block content %} + + +
+
+ Please confirm that you would like to delete all alerts. +
+
+ {% csrf_token %} +
+ + Cancel +
+
+
+{% endblock %} diff --git a/rpkid/rpki/gui/app/templates/app/alert_list.html b/rpkid/rpki/gui/app/templates/app/alert_list.html index 83c8232e..dd0530e4 100644 --- a/rpkid/rpki/gui/app/templates/app/alert_list.html +++ b/rpkid/rpki/gui/app/templates/app/alert_list.html @@ -1,4 +1,5 @@ {% extends "app/app_base.html" %} +{% load url from future %} {% block content %}