From 9deac2bcfc241fd8b3c1d4e8d5b10192e0593be3 Mon Sep 17 00:00:00 2001
From: thomaswoehlke <thomas.woehlke@gmail.com>
Date: Mon, 8 Feb 2021 23:30:35 +0100
Subject: [PATCH] work
---
data/covid19data.sql | 4 ++--
src/covid19/blueprints/admin/admin_views.py | 7 +++++++
.../admin/templates/admin/admin_tasks.html | 19 +++++++++++++++----
3 files changed, 24 insertions(+), 6 deletions(-)
diff --git a/data/covid19data.sql b/data/covid19data.sql
index d1ac8c2a..1fa179c6 100644
--- a/data/covid19data.sql
+++ b/data/covid19data.sql
@@ -2,8 +2,8 @@
-- PostgreSQL database dump
--
--- Dumped from database version 13.1 (Ubuntu 13.1-1.pgdg20.04+1)
--- Dumped by pg_dump version 13.1 (Ubuntu 13.1-1.pgdg20.04+1)
+-- Dumped from database version 13.1 (Ubuntu 13.1-1.pgdg20.10+1)
+-- Dumped by pg_dump version 13.1 (Ubuntu 13.1-1.pgdg20.10+1)
SET statement_timeout = 0;
SET lock_timeout = 0;
diff --git a/src/covid19/blueprints/admin/admin_views.py b/src/covid19/blueprints/admin/admin_views.py
index 3ece402b..240186e6 100644
--- a/src/covid19/blueprints/admin/admin_views.py
+++ b/src/covid19/blueprints/admin/admin_views.py
@@ -92,6 +92,13 @@ def url_admin_database_import():
app.logger.info("url_admin_database_import [done]")
return redirect(url_for('admin.url_admin_tasks'))
+@app_admin.route('/database/dropcreate/only')
+def url_admin_database_dropcreate_only():
+ app.logger.info("url_admin_database_drop [start]")
+ flash("admin_service.run_admin_database_drop started")
+ admin_service.run_admin_database_drop()
+ app.logger.info("url_admin_database_drop [done]")
+ return redirect(url_for('admin.url_admin_tasks'))
@app_admin.route('/database/drop')
def url_admin_database_drop():
diff --git a/src/covid19/blueprints/admin/templates/admin/admin_tasks.html b/src/covid19/blueprints/admin/templates/admin/admin_tasks.html
index 93e164ab..bb995643 100644
--- a/src/covid19/blueprints/admin/templates/admin/admin_tasks.html
+++ b/src/covid19/blueprints/admin/templates/admin/admin_tasks.html
@@ -12,10 +12,21 @@
<div class="row">
<div class="col">
<div class="btn-group-vertical" role="group" aria-label="Views">
- <a class="btn btn-secondary btn-lg btn-block text-left" href="/admin/alive_message" role="button">Admin :: alive message</a>
- <a class="btn btn-primary btn-lg btn-block text-left" href="/admin/database/drop" role="button">Admin :: database :: drop_create</a>
- <a class="btn btn-secondary btn-lg btn-block text-left" href="/admin/database/import" role="button">Admin :: database :: import</a>
- <a class="btn btn-primary btn-lg btn-block text-left" href="/admin/database/dump" role="button">Admin :: database :: dump</a>
+ <a class="btn btn-secondary btn-lg btn-block text-left"
+ href="{{ url_for( 'admin.url_alive_message_start') }}"
+ role="button">Admin :: alive message</a>
+ <a class="btn btn-primary btn-lg btn-block text-left"
+ href="{{ url_for( 'admin.url_admin_database_drop') }}"
+ role="button">Admin :: database :: drop_create</a>
+ <a class="btn btn-primary btn-lg btn-block text-left"
+ href="{{ url_for( 'admin.url_admin_database_dropcreate_only') }}"
+ role="button">Admin :: database :: drop_create :: only</a>
+ <a class="btn btn-secondary btn-lg btn-block text-left"
+ href="{{ url_for( 'admin.url_admin_database_import') }}"
+ role="button">Admin :: database :: import</a>
+ <a class="btn btn-primary btn-lg btn-block text-left"
+ href="{{ url_for( 'admin.url_admin_database_dump') }}"
+ role="button">Admin :: database :: dump</a>
</div>
</div>
</div>
--
GitLab