audrius/reporting-engine
1
0
Fork 1
mirror of https://github.com/OCA/reporting-engine.git synced 2025-02-16 16:30:38 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #232 from SimoRubi/10.0-fix-bi_view_editor-issues

Browse Source 
[10.0] bi_view_editor ValueError if apostrophe
This commit is contained in:
Pedro M. Baeza
2018-10-02 12:03:39 +02:00
committed by GitHub
parent 214aefbe8f a9df4f6ccb
commit 48214802d8
4 changed files with 82 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
bi_view_editor/models/bve_view.py
View File

@@ -39,7 +39,7 @@ class BveView(models.Model):
('created', 'Created')],
default='draft',
copy=False)
data = fields.Text(
data = fields.Serialized(
help="Use the special query builder to define the query "
"to generate your report dataset. "
"NOTE: To be edited, the query should be in 'Draft' status.")
@@ -63,12 +63,6 @@ class BveView(models.Model):
_('Custom BI View names must be unique!')),
]
@classmethod
def _get_format_data(cls, data):
data = data.replace('\'', '"')
data = data.replace(': u"', ':"')
return data
@api.multi
def _create_view_arch(self):
self.ensure_one()
@@ -96,7 +90,7 @@ class BveView(models.Model):
view_fields.append(field_def)
return view_fields
fields_info = json.loads(self._get_format_data(self.data))
fields_info = json.loads(self.data)
view_fields = _get_field_list(fields_info)
return view_fields
@@ -118,7 +112,7 @@ class BveView(models.Model):
view_fields.append(field_def)
return view_fields
fields_info = json.loads(self._get_format_data(self.data))
fields_info = json.loads(self.data)
view_fields = _get_field_list(fields_info)
return view_fields
@@ -219,7 +213,7 @@ class BveView(models.Model):
a.perm_''' + access_mode, (model_name,))
return [x[0] for x in self.env.cr.fetchall()]
info = json.loads(self._get_format_data(self.data))
info = json.loads(self.data)
model_names = list(set([f['model'] for f in info]))
read_groups = set.intersection(*[set(
group_ids_with_access(model_name, 'read')
@@ -286,7 +280,7 @@ class BveView(models.Model):
check_empty_data(self.data)
formatted_data = json.loads(self._get_format_data(self.data))
formatted_data = json.loads(self.data)
info = get_fields_info(formatted_data)
select_fields = get_fields(info)
tables = get_tables(info)
@@ -354,7 +348,7 @@ class BveView(models.Model):
self._create_sql_view()
# create model and fields
data = json.loads(self._get_format_data(self.data))
data = json.loads(self.data)
model_vals = {
'name': self.name,
'model': self.model_name,