From 9cea2479592d0f489b3648999168633fee43b690 Mon Sep 17 00:00:00 2001 From: 0xdade <0xdade@users.noreply.github.com> Date: Thu, 24 Oct 2019 23:50:46 -0700 Subject: [PATCH 1/7] Extract tag modal and script to include, update blacklist route. --- natlas-server/app/admin/routes.py | 2 + .../app/templates/admin/_tagmodal.html | 60 ++++++++++++++++++ .../app/templates/admin/blacklist.html | 2 +- natlas-server/app/templates/admin/scope.html | 61 +------------------ 4 files changed, 64 insertions(+), 61 deletions(-) create mode 100644 natlas-server/app/templates/admin/_tagmodal.html diff --git a/natlas-server/app/admin/routes.py b/natlas-server/app/admin/routes.py index 0f4cf5db..8ead94aa 100644 --- a/natlas-server/app/admin/routes.py +++ b/natlas-server/app/admin/routes.py @@ -135,6 +135,8 @@ def blacklist(): delForm = ScopeDeleteForm() editForm = ScopeToggleForm() importForm = ImportBlacklistForm() + addTagForm = TagScopeForm() + addTagForm.tagname.choices = [(row.name, row.name) for row in Tag.query.all()] if newForm.validate_on_submit(): if '/' not in newForm.target.data: newForm.target.data = newForm.target.data + '/32' diff --git a/natlas-server/app/templates/admin/_tagmodal.html b/natlas-server/app/templates/admin/_tagmodal.html new file mode 100644 index 00000000..1dbc9773 --- /dev/null +++ b/natlas-server/app/templates/admin/_tagmodal.html @@ -0,0 +1,60 @@ +