Fixes for documentation
This commit is contained in:
parent
77a44af384
commit
37a934e7a3
13 changed files with 39 additions and 1 deletions
|
|
@ -44,6 +44,10 @@ if hasattr(config, 'error_reporting'):
|
||||||
|
|
||||||
def prepare_app():
|
def prepare_app():
|
||||||
|
|
||||||
|
# In mod_wsgi, make strange thing with reloading.
|
||||||
|
|
||||||
|
app.reset()
|
||||||
|
|
||||||
def print_memory():
|
def print_memory():
|
||||||
print(resource.getrusage(resource.RUSAGE_SELF).ru_maxrss)
|
print(resource.getrusage(resource.RUSAGE_SELF).ru_maxrss)
|
||||||
|
|
||||||
|
|
@ -151,7 +155,7 @@ try:
|
||||||
prepare_app()
|
prepare_app()
|
||||||
|
|
||||||
except:
|
except:
|
||||||
|
@app.reset()
|
||||||
@app.route('/')
|
@app.route('/')
|
||||||
def catch_errors(all='/'):
|
def catch_errors(all='/'):
|
||||||
try:
|
try:
|
||||||
|
|
|
||||||
|
|
@ -38,6 +38,8 @@ class IntegerField(PhangoField):
|
||||||
|
|
||||||
super(IntegerField, self).__init__(name, size, required)
|
super(IntegerField, self).__init__(name, size, required)
|
||||||
self.default_value=0
|
self.default_value=0
|
||||||
|
self.jtype='integer'
|
||||||
|
self.jformat=''
|
||||||
|
|
||||||
|
|
||||||
self.type_sql='int({})'.format(self.size)
|
self.type_sql='int({})'.format(self.size)
|
||||||
|
|
@ -117,6 +119,8 @@ class FloatField(PhangoField):
|
||||||
self.default_value=0
|
self.default_value=0
|
||||||
self.type_sql='float'.format(self.size)
|
self.type_sql='float'.format(self.size)
|
||||||
|
|
||||||
|
self.jtype='float'
|
||||||
|
|
||||||
def check(self, value):
|
def check(self, value):
|
||||||
|
|
||||||
"""Method for check if value is integer
|
"""Method for check if value is integer
|
||||||
|
|
@ -160,6 +164,7 @@ class DecimalField(FloatField):
|
||||||
|
|
||||||
super().__init__(name, size, required)
|
super().__init__(name, size, required)
|
||||||
self.type_sql='decimal(20,2)'
|
self.type_sql='decimal(20,2)'
|
||||||
|
self.jtype='number'
|
||||||
|
|
||||||
def get_type_sql(self):
|
def get_type_sql(self):
|
||||||
|
|
||||||
|
|
@ -172,6 +177,7 @@ class DoubleField(FloatField):
|
||||||
|
|
||||||
super().__init__(name, size, required)
|
super().__init__(name, size, required)
|
||||||
self.type_sql='double'
|
self.type_sql='double'
|
||||||
|
self.jtype='float'
|
||||||
|
|
||||||
def get_type_sql(self):
|
def get_type_sql(self):
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -41,6 +41,8 @@ class ArrayField(PhangoField):
|
||||||
|
|
||||||
self.type_sql='text'
|
self.type_sql='text'
|
||||||
|
|
||||||
|
self.jtype='array'
|
||||||
|
|
||||||
def check(self, value):
|
def check(self, value):
|
||||||
|
|
||||||
if type(value).__name__=='str':
|
if type(value).__name__=='str':
|
||||||
|
|
|
||||||
|
|
@ -31,6 +31,7 @@ class ColorField(IntegerField):
|
||||||
super().__init__(name, size, required)
|
super().__init__(name, size, required)
|
||||||
|
|
||||||
self.name_form=ColorForm
|
self.name_form=ColorForm
|
||||||
|
self.jtype='string'
|
||||||
|
|
||||||
def check(self, value):
|
def check(self, value):
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -39,6 +39,9 @@ class DateField(PhangoField):
|
||||||
|
|
||||||
self.error_default='Error: Date format invalid'
|
self.error_default='Error: Date format invalid'
|
||||||
|
|
||||||
|
self.jtype='string'
|
||||||
|
self.jformat='date-time'
|
||||||
|
|
||||||
def check(self, value):
|
def check(self, value):
|
||||||
|
|
||||||
if self.utc:
|
if self.utc:
|
||||||
|
|
|
||||||
|
|
@ -42,6 +42,9 @@ class DateTimeField(PhangoField):
|
||||||
|
|
||||||
self.default_value='0000-00-00 00:00:00'
|
self.default_value='0000-00-00 00:00:00'
|
||||||
|
|
||||||
|
self.jformat='date-time'
|
||||||
|
self.jtype='string'
|
||||||
|
|
||||||
def check(self, value):
|
def check(self, value):
|
||||||
|
|
||||||
if self.utc:
|
if self.utc:
|
||||||
|
|
|
||||||
|
|
@ -41,6 +41,8 @@ class DictField(PhangoField):
|
||||||
|
|
||||||
self.type_sql='longtext'
|
self.type_sql='longtext'
|
||||||
|
|
||||||
|
self.jtype='object'
|
||||||
|
|
||||||
def check(self, value):
|
def check(self, value):
|
||||||
|
|
||||||
if type(value).__name__=='str':
|
if type(value).__name__=='str':
|
||||||
|
|
|
||||||
|
|
@ -31,6 +31,8 @@ class EmailField(CharField):
|
||||||
|
|
||||||
self.error_default='Error: No valid format in '+self.name
|
self.error_default='Error: No valid format in '+self.name
|
||||||
|
|
||||||
|
self.jformat='email'
|
||||||
|
|
||||||
def check(self, value):
|
def check(self, value):
|
||||||
|
|
||||||
value=super().check(value)
|
value=super().check(value)
|
||||||
|
|
|
||||||
|
|
@ -3,6 +3,12 @@ import ipaddress
|
||||||
|
|
||||||
class IpField(CharField):
|
class IpField(CharField):
|
||||||
|
|
||||||
|
def __init__(self, name, size=1024, required=False):
|
||||||
|
|
||||||
|
super().__init__(name, size, required)
|
||||||
|
|
||||||
|
self.jformat='ipV4'
|
||||||
|
|
||||||
def check(self, value):
|
def check(self, value):
|
||||||
|
|
||||||
try:
|
try:
|
||||||
|
|
|
||||||
|
|
@ -46,6 +46,8 @@ class JsonField(PhangoField):
|
||||||
|
|
||||||
self.type_sql='longtext'
|
self.type_sql='longtext'
|
||||||
|
|
||||||
|
self.jtype='object'
|
||||||
|
|
||||||
def check(self, value):
|
def check(self, value):
|
||||||
|
|
||||||
if type(value).__name__=='str':
|
if type(value).__name__=='str':
|
||||||
|
|
|
||||||
|
|
@ -41,6 +41,7 @@ class PasswordField(PhangoField):
|
||||||
self.name_form=PasswordForm
|
self.name_form=PasswordForm
|
||||||
self.default_value=''
|
self.default_value=''
|
||||||
self.encrypt_password=True
|
self.encrypt_password=True
|
||||||
|
self.jformat='password'
|
||||||
|
|
||||||
def check(self, value):
|
def check(self, value):
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -15,6 +15,7 @@ class UrlField(CharField):
|
||||||
|
|
||||||
self.error=False
|
self.error=False
|
||||||
self.txt_error=''
|
self.txt_error=''
|
||||||
|
self.jformat='url'
|
||||||
|
|
||||||
if not check_url.match(value):
|
if not check_url.match(value):
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -25,6 +25,7 @@ class PhangoField:
|
||||||
|
|
||||||
Attributes:
|
Attributes:
|
||||||
name (str): The name of the field
|
name (str): The name of the field
|
||||||
|
jtype(Python type): The type of value in python
|
||||||
label (str): A label or generic name for use in text labels used for representate the field
|
label (str): A label or generic name for use in text labels used for representate the field
|
||||||
required (bool): If the field is required or not.
|
required (bool): If the field is required or not.
|
||||||
size (int): The size of sql field.
|
size (int): The size of sql field.
|
||||||
|
|
@ -54,6 +55,10 @@ class PhangoField:
|
||||||
|
|
||||||
self.name=name
|
self.name=name
|
||||||
|
|
||||||
|
# The type of the field in javascript. Util for api documentation
|
||||||
|
|
||||||
|
self.jtype='string'
|
||||||
|
|
||||||
# The label for the Field
|
# The label for the Field
|
||||||
|
|
||||||
self.label=name.replace('_', ' ').title()
|
self.label=name.replace('_', ' ').title()
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue