From c1164014289ea15712949a8db3b96b62651286a0 Mon Sep 17 00:00:00 2001 From: SimoRubi Date: Tue, 14 Aug 2018 08:52:43 +0200 Subject: [PATCH] [FIX] bi_view_editor: Apostrophe + migration script Apostrophe in model name raised ValueError. Added needed migration script. --- bi_view_editor/__manifest__.py | 3 +- .../migrations/10.0.1.0.2/post-migrate.py | 51 +++++++++++++++++++ bi_view_editor/models/bve_view.py | 20 +++----- bi_view_editor/tests/test_bi_view.py | 24 ++++++++- 4 files changed, 84 insertions(+), 14 deletions(-) create mode 100644 bi_view_editor/migrations/10.0.1.0.2/post-migrate.py diff --git a/bi_view_editor/__manifest__.py b/bi_view_editor/__manifest__.py index 01a6aa33..3bc3424b 100644 --- a/bi_view_editor/__manifest__.py +++ b/bi_view_editor/__manifest__.py @@ -12,7 +12,8 @@ 'version': '11.0.1.0.0', 'depends': [ 'base', - 'web' + 'web', + 'base_sparse_field' ], 'data': [ 'security/ir.model.access.csv', diff --git a/bi_view_editor/migrations/10.0.1.0.2/post-migrate.py b/bi_view_editor/migrations/10.0.1.0.2/post-migrate.py new file mode 100644 index 00000000..806bb2d6 --- /dev/null +++ b/bi_view_editor/migrations/10.0.1.0.2/post-migrate.py @@ -0,0 +1,51 @@ +# -*- coding: utf-8 -*- +# Copyright 2018 Simone Rubino - Agile Business Group +# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html). + +from openupgradelib.openupgrade import logged_query, migrate +import json + + +@migrate() +def migrate(env, version): + cr = env.cr + convert_text_to_serialized( + cr, env['bve.view']._table, env['bve.view']._fields['data'].name) + pass + + +def convert_text_to_serialized( + cr, table, text_field_name, serialized_field_name=None): + """ + Convert Text field value to Serialized value. + """ + if not serialized_field_name: + serialized_field_name = text_field_name + select_query = """ +SELECT + id, + %(text_field_name)s +FROM %(table)s +WHERE %(text_field_name)s IS NOT NULL +""" + cr.execute( + select_query % { + 'text_field_name': text_field_name, + 'table': table, + } + ) + update_query = """ +UPDATE %(table)s + SET %(serialized_field_name)s = %%(field_value)s + WHERE id = %(record_id)d +""" + for row in cr.fetchall(): + # Fill in the field_value later because it needs escaping + row_update_query = update_query % { + 'serialized_field_name': serialized_field_name, + 'table': table, + 'record_id': row[0]} + logged_query( + cr, row_update_query, { + 'field_value': json.dumps(row[1]) + }) diff --git a/bi_view_editor/models/bve_view.py b/bi_view_editor/models/bve_view.py index 053fed4f..d7042cfd 100644 --- a/bi_view_editor/models/bve_view.py +++ b/bi_view_editor/models/bve_view.py @@ -7,6 +7,8 @@ from odoo import api, fields, models, tools from odoo.exceptions import UserError from odoo.tools.translate import _ +from odoo.addons.base_sparse_field.models.fields import Serialized + class BveView(models.Model): _name = 'bve.view' @@ -38,7 +40,7 @@ class BveView(models.Model): ('created', 'Created')], default='draft', copy=False) - data = fields.Text( + data = 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.") @@ -62,12 +64,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() @@ -95,7 +91,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 @@ -117,7 +113,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 @@ -218,7 +214,7 @@ class BveView(models.Model): res = self.env.cr.fetchall() return [x[0] for x in res] - 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') @@ -289,7 +285,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) @@ -387,7 +383,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, diff --git a/bi_view_editor/tests/test_bi_view.py b/bi_view_editor/tests/test_bi_view.py index 4175b8fc..0f4d96e9 100644 --- a/bi_view_editor/tests/test_bi_view.py +++ b/bi_view_editor/tests/test_bi_view.py @@ -1,6 +1,8 @@ # Copyright 2017-2018 Onestein () # License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl). +import json + from odoo.tests.common import TransactionCase, at_install, post_install from odoo.exceptions import UserError @@ -99,7 +101,7 @@ class TestBiViewEditor(TransactionCase): 'measure': 0 } ] - format_data = self.env['bve.view']._get_format_data(str(data)) + format_data = json.dumps(data) self.bi_view1_vals = { 'state': 'draft', @@ -227,3 +229,23 @@ class TestBiViewEditor(TransactionCase): # try to remove view with self.assertRaises(UserError): bi_view.unlink() + + @at_install(False) + @post_install(True) + def test_10_create_open_bve_object_apostrophe(self): + vals = self.bi_view1_vals + employees_group = self.env.ref('base.group_user') + vals.update({ + 'name': "Test View5", + 'group_ids': [(6, 0, [employees_group.id])], + }) + l = list() + for r in json.loads(vals['data']): + r['model_name'] = "model'name" + l.append(r) + new_format_data = json.dumps(l) + vals.update({'data': new_format_data}) + bi_view = self.env['bve.view'].create(vals) + self.assertEqual(len(bi_view), 1) + # create bve object + bi_view.action_create()