|
@@ -153,6 +153,7 @@ class Demeter(object):
|
|
|
|
|
|
|
|
@classmethod
|
|
@classmethod
|
|
|
def service(self, name):
|
|
def service(self, name):
|
|
|
|
|
+ self.initConfig()
|
|
|
path = 'service.'
|
|
path = 'service.'
|
|
|
if name == 'common':
|
|
if name == 'common':
|
|
|
path = 'demeter.'
|
|
path = 'demeter.'
|
|
@@ -162,6 +163,7 @@ class Demeter(object):
|
|
|
|
|
|
|
|
@classmethod
|
|
@classmethod
|
|
|
def adminModel(self, table):
|
|
def adminModel(self, table):
|
|
|
|
|
+ self.initConfig()
|
|
|
config = ('manage_admin', 'manage_log', 'manage_role')
|
|
config = ('manage_admin', 'manage_log', 'manage_role')
|
|
|
if table in config:
|
|
if table in config:
|
|
|
return self.getClass(table, 'demeter.admin.model.')
|
|
return self.getClass(table, 'demeter.admin.model.')
|
|
@@ -169,6 +171,7 @@ class Demeter(object):
|
|
|
|
|
|
|
|
@classmethod
|
|
@classmethod
|
|
|
def model(self, table, name='rdb'):
|
|
def model(self, table, name='rdb'):
|
|
|
|
|
+ self.initConfig()
|
|
|
name = self.config['db'][name]
|
|
name = self.config['db'][name]
|
|
|
config = self.config[name]
|
|
config = self.config[name]
|
|
|
obj = self.getObject('db', 'demeter.')
|
|
obj = self.getObject('db', 'demeter.')
|
|
@@ -230,6 +233,7 @@ class Demeter(object):
|
|
|
|
|
|
|
|
@classmethod
|
|
@classmethod
|
|
|
def webInit(self, name):
|
|
def webInit(self, name):
|
|
|
|
|
+ self.initConfig()
|
|
|
self.web = name
|
|
self.web = name
|
|
|
self.webPath = self.path + self.web + '/'
|
|
self.webPath = self.path + self.web + '/'
|
|
|
if self.web == 'admin':
|
|
if self.web == 'admin':
|
|
@@ -475,6 +479,4 @@ class Check(object):
|
|
|
float(value)
|
|
float(value)
|
|
|
return True
|
|
return True
|
|
|
except ValueError:
|
|
except ValueError:
|
|
|
- return False
|
|
|
|
|
-
|
|
|
|
|
-Demeter.initConfig()
|
|
|
|
|
|
|
+ return False
|
rabin