Fixes in corefields
This commit is contained in:
parent
fbb2e1012c
commit
8e05927a32
7 changed files with 21 additions and 8 deletions
|
|
@ -1,6 +1,7 @@
|
|||
from paramecio2.libraries.db.webmodel import PhangoField
|
||||
from paramecio2.libraries.db import coreforms
|
||||
from paramecio2.libraries.i18n import I18n
|
||||
from bs4 import BeautifulSoup
|
||||
|
||||
class IntegerField(PhangoField):
|
||||
|
||||
|
|
@ -157,10 +158,17 @@ class HTMLField(TextField):
|
|||
|
||||
def __init__(self, name, required=False):
|
||||
super().__init__(name, required)
|
||||
self.trusted_tags=[]
|
||||
|
||||
def check(self, value):
|
||||
|
||||
return re.sub('<.*?script?>', '', value)
|
||||
soup=BeautifulSoup(value, features='html.parser')
|
||||
|
||||
for tag in soup.findAll(True):
|
||||
if tag.name not in self.trusted_tags:
|
||||
tag.hidden=True
|
||||
|
||||
return soup.renderContents().decode('utf-8')
|
||||
|
||||
|
||||
class ForeignKeyField(IntegerField):
|
||||
|
|
|
|||
|
|
@ -20,7 +20,7 @@ class DateField(PhangoField):
|
|||
|
||||
value=datetime.local_to_gmt(value)
|
||||
|
||||
elif not datetime.obtain_timestamp(value, False):
|
||||
elif not datetime.obtain_timestamp(value):
|
||||
|
||||
self.error=True
|
||||
self.txt_error=self.error_default
|
||||
|
|
|
|||
|
|
@ -20,7 +20,7 @@ class DateTimeField(PhangoField):
|
|||
|
||||
value=datetime.local_to_gmt(value)
|
||||
|
||||
elif not datetime.obtain_timestamp(value, False):
|
||||
elif not datetime.obtain_timestamp(value):
|
||||
|
||||
self.error=True
|
||||
self.txt_error=self.error_default
|
||||
|
|
|
|||
|
|
@ -1,4 +1,5 @@
|
|||
from paramecio2.libraries.db.webmodel import WebModel, PhangoField
|
||||
import sys
|
||||
try:
|
||||
|
||||
import ujson as json
|
||||
|
|
@ -77,7 +78,7 @@ class JsonValueField(PhangoField):
|
|||
|
||||
except json.JSONDecodeError:
|
||||
|
||||
value={}
|
||||
final_value={}
|
||||
self.error=True
|
||||
self.txt_error=self.error_default
|
||||
|
||||
|
|
|
|||
|
|
@ -478,8 +478,8 @@ class WebModel:
|
|||
return False
|
||||
|
||||
except:
|
||||
self.query_error='Cannot insert the new row'
|
||||
print(sys.exc_info()[0])
|
||||
self.query_error='Cannot insert the new row '+sys.exc_info()[0]
|
||||
#print(sys.exc_info()[0])
|
||||
return False
|
||||
|
||||
c=len(values)
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue