Skip to content
Snippets Groups Projects
Unverified Commit 9a603b6c authored by Sandeep Chauhan's avatar Sandeep Chauhan Committed by GitHub
Browse files

Fix errors for compare revisions page(JSONDecodeError and Invalid literal int error) (#3727)

Fixes #3709
parent 8da77783
No related branches found
Tags v5.3.1
1 merge request!54Merge 5.3.1
......@@ -51,6 +51,8 @@ class ValueBlock(ApplicationSingleIncludeFieldBlock):
icon = "decimal"
def prepare_data(self, value, data, serialize):
if not data:
return data
return format_number_as_currency(str(data))
......@@ -99,6 +101,8 @@ class AddressFieldBlock(ApplicationSingleIncludeFieldBlock):
return ", ".join(data[field] for field in ADDRESS_FIELDS_ORDER if data[field])
def prepare_data(self, value, data, serialize):
if not data:
return data
data = json.loads(data)
data = {field: data[field] for field in ADDRESS_FIELDS_ORDER}
......@@ -193,6 +197,8 @@ class DurationBlock(ApplicationSingleIncludeFieldBlock):
return field_kwargs
def prepare_data(self, value, data, serialize):
if not data:
return data
if value["duration_type"] == self.DAYS:
return self.DURATION_DAY_OPTIONS[int(data)]
if value["duration_type"] == self.WEEKS:
......
......@@ -285,6 +285,8 @@ class CheckboxesFieldBlock(OptionalFormFieldBlock):
return kwargs
def prepare_data(self, value, data, serialize=False):
if not data:
return data
base_prepare = super().prepare_data
return [base_prepare(value, item, serialize) for item in data]
......@@ -443,7 +445,9 @@ class MultiFileFieldBlock(UploadableMediaBlock):
def prepare_data(self, value, data, serialize):
if serialize:
return [file.serialize() for file in data]
if data:
return [file.serialize() for file in data]
return None
return data
def no_response(self):
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment