add_place.py

@@ -1,12 +1,12 @@
 #!/usr/bin/python3
 
-from main import app
 import sys
+
 from confarchive import database, model, wikidata
 
+DB_URL = "postgresql:///confarchive"
 
-app.config.from_object("config.default")
+database.init_db(DB_URL)
-database.init_app(app)
 
 
 def add_country(name: str) -> None:

main.py

@@ -156,9 +156,7 @@ def search_people() -> str:
     q = model.Person.query.filter(model.Person.name.ilike(f"%{search_for}%")).order_by(
         model.Person.name
     )
-    return flask.render_template(
+    return flask.render_template("search_people.html", q=q, search_for=search_for)
-        "search_people.html", q=q, search_for=search_for, is_admin=check_admin_mode
-    )
 
 
 @app.route("/merge", methods=["GET", "POST"])

templates/search_people.html

@@ -20,7 +20,7 @@
     {% set count = q.count() %}
     Found {{ count }} people matching '{{ search_for }}'
 
-    {% if is_admin() and count %}
+    {% if config.ADMIN_MODE and count %}
     <a href="{{ url_for("merge", q=search_for) }}">merge</a>
     {% endif %}
     </p>