1
0
mirror of https://github.com/janeczku/calibre-web synced 2025-11-14 14:17:10 +00:00

Bugfix for accessing config database

Title now displaed on every page
Title can be changed from within application
This commit is contained in:
OzzieIsaacs
2017-01-22 21:30:36 +01:00
parent 4eee58c21c
commit 75c89c28e1
8 changed files with 149 additions and 116 deletions

View File

@@ -7,7 +7,6 @@ from sqlalchemy.ext.declarative import declarative_base
from sqlalchemy.orm import *
from flask_login import AnonymousUserMixin
import os
# import config
import traceback
from werkzeug.security import generate_password_hash
from flask_babel import gettext as _
@@ -98,6 +97,9 @@ class UserBase():
class Config():
def __init__(self):
self.config_main_dir=os.path.join(os.path.normpath(os.path.dirname(
os.path.realpath(__file__)) + os.sep + ".." + os.sep))
self.db_configured=None
self.loadSettings()
def loadSettings(self):
@@ -112,6 +114,18 @@ class Config():
self.config_uploading = data.config_uploading
self.config_anonbrowse = data.config_anonbrowse
self.config_public_reg = data.config_public_reg
if self.config_calibre_dir is not None and (self.db_configured is None or self.db_configured is True):
self.db_configured=True
else:
self.db_configured = False
@property
def get_main_dir(self):
return self.config_main_dir
@property
def is_Calibre_Configured(self):
return self.db_configured
class User(UserBase,Base):
@@ -135,7 +149,7 @@ class User(UserBase,Base):
class Anonymous(AnonymousUserMixin,UserBase):
anon_browse = None
# anon_browse = None
def __init__(self):
self.loadSettings()