FIxes in models
This commit is contained in:
parent
a7d2456857
commit
50c030de53
6 changed files with 29 additions and 7 deletions
|
|
@ -29,8 +29,6 @@ def run_cherrypy_server():
|
|||
# Instantiate a new server object
|
||||
server = cherrypy._cpserver.Server()
|
||||
|
||||
server.thread_pool=30
|
||||
|
||||
# Configure the server object
|
||||
server.socket_host=config.host
|
||||
server.socket_port=config.port
|
||||
|
|
|
|||
|
|
@ -135,13 +135,15 @@ class TextField(PhangoField):
|
|||
def __init__(self, name, required=False):
|
||||
super().__init__(name, 11, required)
|
||||
|
||||
self.set_default='NOT NULL'
|
||||
|
||||
def get_type_sql(self):
|
||||
|
||||
"""Method for return the sql code for this type
|
||||
|
||||
"""
|
||||
|
||||
return 'TEXT NOT NULL'
|
||||
return 'TEXT '+self.set_default
|
||||
|
||||
class HTMLField(TextField):
|
||||
|
||||
|
|
|
|||
|
|
@ -11,6 +11,8 @@ class ArrayField(PhangoField):
|
|||
|
||||
self.error_default='Sorry, the json array is invalid'
|
||||
|
||||
self.set_default='NOT NULL'
|
||||
|
||||
def check(self, value):
|
||||
|
||||
if type(value).__name__=='str':
|
||||
|
|
@ -41,7 +43,7 @@ class ArrayField(PhangoField):
|
|||
|
||||
def get_type_sql(self):
|
||||
|
||||
return 'TEXT NOT NULL'
|
||||
return 'TEXT '+self.set_default
|
||||
|
||||
def show_formatted(self, value):
|
||||
|
||||
|
|
|
|||
|
|
@ -11,6 +11,8 @@ class DictField(PhangoField):
|
|||
|
||||
self.error_default='Sorry, the json dict is invalid'
|
||||
|
||||
self.set_default='NOT NULL'
|
||||
|
||||
def check(self, value):
|
||||
|
||||
if type(value).__name__=='str':
|
||||
|
|
@ -40,7 +42,7 @@ class DictField(PhangoField):
|
|||
|
||||
def get_type_sql(self):
|
||||
|
||||
return 'TEXT NOT NULL'
|
||||
return 'TEXT '+self.set_default
|
||||
|
||||
def show_formatted(self, value):
|
||||
|
||||
|
|
|
|||
|
|
@ -77,6 +77,9 @@ class I18nField(PhangoField):
|
|||
|
||||
def show_formatted(self, value):
|
||||
|
||||
if value=='':
|
||||
value='{"en-US": "", "es-ES": ""}'
|
||||
|
||||
value=json.loads(value)
|
||||
|
||||
lang=I18n.get_default_lang()
|
||||
|
|
|
|||
|
|
@ -256,9 +256,9 @@ class WebModel:
|
|||
|
||||
def __init__(self, sqlclass=None, name_field_id="id"):
|
||||
|
||||
self.cached=self.global_cached
|
||||
self.cached=WebModel.global_cached
|
||||
|
||||
self.cached_runquery=self.global_cached
|
||||
self.cached_runquery=WebModel.global_cached
|
||||
|
||||
self.type_cache='file'
|
||||
|
||||
|
|
@ -1334,3 +1334,18 @@ class WebModel:
|
|||
|
||||
return post
|
||||
|
||||
class QueryModel(WebModel):
|
||||
|
||||
def __init__(self, model_name, sqlclass=None, name_field_id="id"):
|
||||
|
||||
super().__init__(sqlclass, name_field_id)
|
||||
|
||||
self.name=model_name.lower()
|
||||
|
||||
self.label=self.name
|
||||
|
||||
self.label_general=self.name
|
||||
|
||||
self.order_by="ORDER BY `"+self.name+"`.`id` ASC"
|
||||
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue