From 5fde29a34c87bfdf1958aa30516c17f0f84d41df Mon Sep 17 00:00:00 2001 From: Doug Blank Date: Sat, 9 May 2015 18:07:54 -0400 Subject: [PATCH] django.setup() now required; bringing database up to date with current gramps (missing db.is_empty()) --- gramps/webapp/dbdjango.py | 15 +++++++++++++++ gramps/webapp/settings.py | 3 +++ gramps/webapp/shell.py | 4 ++++ 3 files changed, 22 insertions(+) diff --git a/gramps/webapp/dbdjango.py b/gramps/webapp/dbdjango.py index c1fe64794..436e7d38b 100644 --- a/gramps/webapp/dbdjango.py +++ b/gramps/webapp/dbdjango.py @@ -1354,3 +1354,18 @@ class DbDjango(DbWriteBase, DbReadBase): return self._tables[table_name]["handle_func"](handle) return None + def is_empty(self): + """ + Is the database empty? + """ + return (self.get_number_of_people() == 0 and + self.get_number_of_events() == 0 and + self.get_number_of_places() == 0 and + self.get_number_of_tags() == 0 and + self.get_number_of_families() == 0 and + self.get_number_of_notes() == 0 and + self.get_number_of_citations() == 0 and + self.get_number_of_sources() == 0 and + self.get_number_of_media_objects() == 0 and + self.get_number_of_repositories() == 0) + diff --git a/gramps/webapp/settings.py b/gramps/webapp/settings.py index 6aa51e168..4ded2cd04 100644 --- a/gramps/webapp/settings.py +++ b/gramps/webapp/settings.py @@ -167,5 +167,8 @@ LOGIN_URL = "/login/" LOGOUT_URL = "/logout" LOGIN_REDIRECT_URL = "/" +## Changes for Django 1.6: +LOGGING = None + ## Changes for Django 1.7.1: ABSOLUTE_URL_OVERRIDES = {} diff --git a/gramps/webapp/shell.py b/gramps/webapp/shell.py index 46d7f0b1a..b6649d1c1 100644 --- a/gramps/webapp/shell.py +++ b/gramps/webapp/shell.py @@ -65,6 +65,10 @@ except RuntimeError: # already configured; ignore pass +# For Django 1.6: +import django +django.setup() + from gramps.webapp.grampsdb.models import * from gramps.webapp.grampsdb.forms import * from gramps.webapp.dbdjango import DbDjango