paramecio/parameciofm
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

FIxes in models

Browse source
This commit is contained in:
Antonio de la Rosa 2018-05-22 20:40:02 +02:00
parent a7d2456857
commit 50c030de53
6 changed files with 29 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

2
paramecio/cherry.py
View file

@ -29,8 +29,6 @@ def run_cherrypy_server():
# Instantiate a new server object # Instantiate a new server object
server = cherrypy._cpserver.Server() server = cherrypy._cpserver.Server()
server.thread_pool=30
# Configure the server object # Configure the server object
server.socket_host=config.host server.socket_host=config.host
server.socket_port=config.port server.socket_port=config.port

4
paramecio/cromosoma/corefields.py
View file

@ -135,13 +135,15 @@ class TextField(PhangoField):
def __init__(self, name, required=False): def __init__(self, name, required=False):
super().__init__(name, 11, required) super().__init__(name, 11, required)
self.set_default='NOT NULL'
def get_type_sql(self): def get_type_sql(self):
"""Method for return the sql code for this type """Method for return the sql code for this type
""" """
return 'TEXT NOT NULL' return 'TEXT '+self.set_default
class HTMLField(TextField): class HTMLField(TextField):

4
paramecio/cromosoma/extrafields/arrayfield.py
View file

@ -10,6 +10,8 @@ class ArrayField(PhangoField):
self.field_type=field_type self.field_type=field_type
self.error_default='Sorry, the json array is invalid' self.error_default='Sorry, the json array is invalid'
self.set_default='NOT NULL'
def check(self, value): def check(self, value):
@ -41,7 +43,7 @@ class ArrayField(PhangoField):
def get_type_sql(self): def get_type_sql(self):
return 'TEXT NOT NULL' return 'TEXT '+self.set_default
def show_formatted(self, value): def show_formatted(self, value):

4
paramecio/cromosoma/extrafields/dictfield.py
View file

@ -10,6 +10,8 @@ class DictField(PhangoField):
self.field_type=field_type self.field_type=field_type
self.error_default='Sorry, the json dict is invalid' self.error_default='Sorry, the json dict is invalid'
self.set_default='NOT NULL'
def check(self, value): def check(self, value):
@ -40,7 +42,7 @@ class DictField(PhangoField):
def get_type_sql(self): def get_type_sql(self):
return 'TEXT NOT NULL' return 'TEXT '+self.set_default
def show_formatted(self, value): def show_formatted(self, value):

3
paramecio/cromosoma/extrafields/i18nfield.py
View file

@ -77,6 +77,9 @@ class I18nField(PhangoField):
def show_formatted(self, value): def show_formatted(self, value):
if value=='':
value='{"en-US": "", "es-ES": ""}'
value=json.loads(value) value=json.loads(value)
lang=I18n.get_default_lang() lang=I18n.get_default_lang()

19
paramecio/cromosoma/webmodel.py
View file

@ -256,9 +256,9 @@ class WebModel:
def __init__(self, sqlclass=None, name_field_id="id"): 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' self.type_cache='file'
@ -1334,3 +1334,18 @@ class WebModel:
return post 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"