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

Fixes in imagefield and jsonfield

Browse source
This commit is contained in:
absurdo 2023-09-13 00:17:46 +02:00
parent a741e51a76
commit bc05d7725e
3 changed files with 43 additions and 36 deletions
Download patch file Download diff file Expand all files Collapse all files

72
paramecio2/libraries/db/extrafields/imagefield.py
View file

@ -72,44 +72,50 @@ class ImageField(CharField):
#if not change
if not field_file in files_uploaded:
if value=='':
if field_file in files_uploaded:
if files_uploaded[field_file].filename=='':
if self.model:
if value=='':
if self.model.updated:
if self.model:
old_reset=self.model.yes_reset_conditions
self.model.yes_reset_conditions=False
with self.model.select([self.name]) as cur:
for arr_image in cur:
if arr_image[self.name]!='':
try:
os.remove(arr_image[self.name])
except:
pass
#if arr_image[self.name]!=save_file and arr_image[self.name]!='':
#value=arr_image[self.name]
self.model.yes_reset_conditions=old_reset
self.txt_error='Field is empty'
self.error=True
return ''
if self.model.updated:
old_reset=self.model.yes_reset_conditions
self.model.yes_reset_conditions=False
with self.model.select([self.name]) as cur:
for arr_image in cur:
if arr_image[self.name]!='':
try:
os.remove(arr_image[self.name])
except:
pass
#if arr_image[self.name]!=save_file and arr_image[self.name]!='':
#value=arr_image[self.name]
self.model.yes_reset_conditions=old_reset
self.txt_error='Field is empty'
self.error=True
return ''
else:
value=os.path.basename(value)
return self.save_folder+'/'+value
else:
value=os.path.basename(value)
return self.save_folder+'/'+value
else:
value=os.path.basename(value)
return self.save_folder+'/'+value
# Load image file

3
paramecio2/libraries/db/extrafields/jsonfield.py
View file

@ -72,6 +72,7 @@ class JsonValueField(PhangoField):
super().__init__(name, required)
self.error_default='Sorry, the json dict is invalid'
self.default_value={}
#self.set_default='NOT NULL'
@ -86,7 +87,7 @@ class JsonValueField(PhangoField):
except json.JSONDecodeError:
final_value={}
final_value='{}'
self.error=True
self.txt_error=self.error_default