From 3c4a4feb040a6cd8c02aa3eba2097b5575a332d2 Mon Sep 17 00:00:00 2001 From: Oleg Bulkin Date: Mon, 14 Nov 2016 17:57:15 -0800 Subject: [PATCH 1/7] [ADD] web_kanban_stage: Stage model and abstract logic * Add Kanban-compatible stage model web.kanban.stage * Add views, menu items, actions, and access controls needed to manage web.kanban.stage records * Add abstract model web.kanban.abstract that other models can inherit from to gain Kanban stage functionality * Add base Kanban view web_kanban_abstract_view_kanban, which can be customized as needed for use with models that inherit from web.kanban.abstract * Add model web.kanban.abstract.tester, which is needed for web.kanban.abstract unit tests --- web_kanban_stage/README.rst | 108 +++++++++++++++++ web_kanban_stage/__init__.py | 5 + web_kanban_stage/__openerp__.py | 23 ++++ web_kanban_stage/models/__init__.py | 6 + .../models/web_kanban_abstract.py | 112 ++++++++++++++++++ web_kanban_stage/models/web_kanban_stage.py | 84 +++++++++++++ web_kanban_stage/security/ir.model.access.csv | 3 + web_kanban_stage/static/description/icon.png | Bin 0 -> 9455 bytes web_kanban_stage/tests/__init__.py | 6 + .../tests/test_web_kanban_abstract.py | 66 +++++++++++ .../tests/test_web_kanban_stage.py | 50 ++++++++ .../views/web_kanban_abstract.xml | 64 ++++++++++ web_kanban_stage/views/web_kanban_stage.xml | 71 +++++++++++ 13 files changed, 598 insertions(+) create mode 100644 web_kanban_stage/README.rst create mode 100644 web_kanban_stage/__init__.py create mode 100644 web_kanban_stage/__openerp__.py create mode 100644 web_kanban_stage/models/__init__.py create mode 100644 web_kanban_stage/models/web_kanban_abstract.py create mode 100644 web_kanban_stage/models/web_kanban_stage.py create mode 100644 web_kanban_stage/security/ir.model.access.csv create mode 100644 web_kanban_stage/static/description/icon.png create mode 100644 web_kanban_stage/tests/__init__.py create mode 100644 web_kanban_stage/tests/test_web_kanban_abstract.py create mode 100644 web_kanban_stage/tests/test_web_kanban_stage.py create mode 100644 web_kanban_stage/views/web_kanban_abstract.xml create mode 100644 web_kanban_stage/views/web_kanban_stage.xml diff --git a/web_kanban_stage/README.rst b/web_kanban_stage/README.rst new file mode 100644 index 000000000..6c1982f61 --- /dev/null +++ b/web_kanban_stage/README.rst @@ -0,0 +1,108 @@ +.. image:: https://img.shields.io/badge/licence-lgpl--3-blue.svg + :target: http://www.gnu.org/licenses/LGPL-3.0-standalone.html + :alt: License: LGPL-3 + +====================== +Kanban - Stage Support +====================== + +This module provides a stage model compatible with Kanban views and the +standard views needed to manage these stages. It also provides the +``web.kanban.abstract`` model, which can be inherited to add support for +Kanban views with stages to any other model. Lastly, it includes a base Kanban +view that can be extended as needed. + +Installation +============ + +To install this module, simply follow the standard install process. + +Configuration +============= + +No configuration is needed or possible. + +Usage +===== + +* Inherit from ``web.kanban.abstract`` to add Kanban stage functionality to + the child model: + + .. code-block:: python + + class MyModel(models.Model): + _name = 'my.model' + _inherit = 'web.kanban.abstract' + +* Extend the provided base Kanban view (``web_kanban_abstract_view_kanban``) + as needed by the child model. The base view has four ``name`` attributes + intended to provide convenient XPath access to different parts of the Kanban + card. They are ``card_dropdown_menu``, ``card_header``, ``card_body``, and + ``card_footer``: + + .. code-block:: xml + + + My Model - Kanban View + my.model + + + + + + + + + + + +* To manage stages, go to Settings > Technical > Kanban > Stages. + +.. image:: https://odoo-community.org/website/image/ir.attachment/5784_f2813bd/datas + :alt: Try me on Runbot + :target: https://runbot.odoo-community.org/runbot/162/9.0 + +Known Issues / Roadmap +====================== + +* The grouping logic used by ``web.kanban.abstract`` currently does not + support additional domains and alternate sort orders + +Bug Tracker +=========== + +Bugs are tracked on `GitHub Issues `_. In +case of trouble, please check there if your issue has already been reported. +If you spotted it first, help us smash it by providing detailed and welcomed +feedback. + +Credits +======= + +Images +------ + +* Odoo Community Association: + `Icon `_. + +Contributors +------------ + +* Dave Lasley +* Oleg Bulkin +* Daniel Reis + +Maintainer +---------- + +.. image:: https://odoo-community.org/logo.png + :alt: Odoo Community Association + :target: https://odoo-community.org + +This module is maintained by the OCA. + +OCA, or the Odoo Community Association, is a nonprofit organization whose +mission is to support the collaborative development of Odoo features and +promote its widespread use. + +To contribute to this module, please visit http://odoo-community.org. diff --git a/web_kanban_stage/__init__.py b/web_kanban_stage/__init__.py new file mode 100644 index 000000000..6b7b00c35 --- /dev/null +++ b/web_kanban_stage/__init__.py @@ -0,0 +1,5 @@ +# -*- coding: utf-8 -*- +# Copyright 2016 LasLabs Inc. +# License LGPL-3.0 or later (http://www.gnu.org/licenses/lgpl.html). + +from . import models diff --git a/web_kanban_stage/__openerp__.py b/web_kanban_stage/__openerp__.py new file mode 100644 index 000000000..86ab22b79 --- /dev/null +++ b/web_kanban_stage/__openerp__.py @@ -0,0 +1,23 @@ +# -*- coding: utf-8 -*- +# Copyright 2016 LasLabs Inc. +# License LGPL-3.0 or later (http://www.gnu.org/licenses/lgpl.html). + +{ + 'name': 'Kanban - Stage Support', + 'summary': 'Provides stage model and abstract logic for inheritance', + 'version': '9.0.1.0.0', + 'author': "LasLabs, Odoo Community Association (OCA)", + 'category': 'Web', + 'depends': [ + 'web_kanban', + ], + 'website': 'https://laslabs.com', + 'license': 'LGPL-3', + 'data': [ + 'security/ir.model.access.csv', + 'views/web_kanban_abstract.xml', + 'views/web_kanban_stage.xml', + ], + 'installable': True, + 'application': False, +} diff --git a/web_kanban_stage/models/__init__.py b/web_kanban_stage/models/__init__.py new file mode 100644 index 000000000..1b31900ee --- /dev/null +++ b/web_kanban_stage/models/__init__.py @@ -0,0 +1,6 @@ +# -*- coding: utf-8 -*- +# Copyright 2016 LasLabs Inc. +# License LGPL-3.0 or later (http://www.gnu.org/licenses/lgpl.html). + +from . import web_kanban_abstract +from . import web_kanban_stage diff --git a/web_kanban_stage/models/web_kanban_abstract.py b/web_kanban_stage/models/web_kanban_abstract.py new file mode 100644 index 000000000..67cebef28 --- /dev/null +++ b/web_kanban_stage/models/web_kanban_abstract.py @@ -0,0 +1,112 @@ +# -*- coding: utf-8 -*- +# Copyright 2016 LasLabs Inc. +# License LGPL-3.0 or later (http://www.gnu.org/licenses/lgpl.html). + +from openerp import api, fields, models + + +class WebKanbanAbstract(models.AbstractModel): + '''Inherit from this class to add support for Kanban stages to your model. + All public properties are preceded with kanban_ in order to isolate from + child models, with the exception of stage_id, which is a required field in + the Kanban widget and must be defined as such.''' + + _name = 'web.kanban.abstract' + _order = 'kanban_priority desc, kanban_sequence' + _group_by_full = { + 'stage_id': lambda s, *a, **k: s._read_group_stage_ids(*a, **k), + } + + kanban_sequence = fields.Integer( + default=10, + index=True, + help='Order of record in relation to other records in the same Kanban' + ' stage and with the same priority', + ) + kanban_priority = fields.Selection( + selection=[('0', 'Normal'), ('5', 'Medium'), ('10', 'High')], + index=True, + default='0', + help='The priority of the record (shown as stars in Kanban views)', + ) + stage_id = fields.Many2one( + string='Kanban Stage', + comodel_name='web.kanban.stage', + track_visibility='onchange', + index=True, + copy=False, + help='The Kanban stage that this record is currently in', + default=lambda s: s._default_stage_id(), + domain=lambda s: [('res_model.model', '=', s._name)], + ) + kanban_user_id = fields.Many2one( + string='Assigned To', + comodel_name='res.users', + index=True, + track_visibility='onchange', + help='User that the record is currently assigned to', + ) + kanban_color = fields.Integer( + string='Color Index', + help='Color index to be used for the record\'s Kanban card', + ) + kanban_legend_priority = fields.Text( + string='Priority Explanation', + related='stage_id.legend_priority', + help='Explanation text to help users understand how the priority/star' + ' mechanism applies to this record (depends on current stage)', + ) + kanban_legend_blocked = fields.Text( + string='Special Handling Explanation', + related='stage_id.legend_blocked', + help='Explanation text to help users understand how the special' + ' handling status applies to this record (depends on current' + ' stage)', + ) + kanban_legend_done = fields.Text( + string='Ready Explanation', + related='stage_id.legend_done', + help='Explanation text to help users understand how the ready' + ' status applies to this record (depends on current stage)', + ) + kanban_legend_normal = fields.Text( + string='Normal Handling Explanation', + related='stage_id.legend_normal', + help='Explanation text to help users understand how the normal' + ' handling status applies to this record (depends on current' + ' stage)', + ) + kanban_status = fields.Selection( + selection=[ + ('normal', 'Normal Handling'), + ('done', 'Ready'), + ('blocked', 'Special Handling'), + ], + string='Kanban Status', + default='normal', + track_visibility='onchange', + required=True, + copy=False, + help='A record can have one of several Kanban statuses, which are used' + ' to indicate whether there are any special situations affecting' + ' it. The exact meaning of each status is allowed to vary based' + ' on the stage the record is in but they are roughly as follow:\n' + '* Normal Handling: Default status, no special situations\n' + '* Ready: Ready to transition to the next stage\n' + '* Special Handling: Blocked in some way (e.g. must be handled by' + ' a specific user)\n' + ) + + @api.model + def _default_stage_id(self): + return + + @api.multi + def _read_group_stage_ids( + self, domain=None, read_group_order=None, access_rights_uid=None + ): + stage_model = self.env['web.kanban.stage'].sudo(access_rights_uid) + stages = stage_model.search([('res_model.model', '=', self._name)]) + names = [(r.id, r.display_name) for r in stages] + fold = {r.id: r.fold for r in stages} + return names, fold diff --git a/web_kanban_stage/models/web_kanban_stage.py b/web_kanban_stage/models/web_kanban_stage.py new file mode 100644 index 000000000..b40a7aaf3 --- /dev/null +++ b/web_kanban_stage/models/web_kanban_stage.py @@ -0,0 +1,84 @@ +# -*- coding: utf-8 -*- +# Copyright 2016 LasLabs Inc. +# License LGPL-3.0 or later (http://www.gnu.org/licenses/lgpl.html). + +from openerp import api, fields, models + + +class WebKanbanStage(models.Model): + _name = 'web.kanban.stage' + _description = 'Kanban Stage' + _order = 'res_model, sequence' + + name = fields.Char( + string='Stage Name', + translate=True, + required=True, + help='Displayed as the header for this stage in Kanban views', + ) + description = fields.Text( + translate=True, + help='Short description of the stage\'s meaning/purpose', + ) + sequence = fields.Integer( + default=1, + required=True, + index=True, + help='Order of stage in relation to other stages available for the' + ' same model', + ) + legend_priority = fields.Text( + string='Priority Explanation', + translate=True, + default='Mark a card as medium or high priority (one or two stars) to' + ' indicate that it should be escalated ahead of others with' + ' lower priority/star counts.', + help='Explanation text to help users understand how the priority/star' + ' mechanism applies to this stage', + ) + legend_blocked = fields.Text( + string='Special Handling Explanation', + translate=True, + default='Give a card the special handling status to indicate that it' + ' requires handling by a special user or subset of users.', + help='Explanation text to help users understand how the special' + ' handling status applies to this stage', + ) + legend_done = fields.Text( + string='Ready Explanation', + translate=True, + default='Mark a card as ready when it has been fully processed.', + help='Explanation text to help users understand how the ready status' + ' applies to this stage', + ) + legend_normal = fields.Text( + string='Normal Handling Explanation', + translate=True, + default='This is the default status and indicates that a card can be' + ' processed by any user working this queue.', + help='Explanation text to help users understand how the normal' + ' handling status applies to this stage', + ) + fold = fields.Boolean( + string='Collapse?', + help='Determines whether this stage will be collapsed down in Kanban' + ' views', + ) + res_model = fields.Many2one( + string='Associated Model', + comodel_name='ir.model', + required=True, + index=True, + help='The model that this Kanban stage will be used for', + domain=[('transient', '=', False)], + default=lambda s: s._default_res_model(), + ) + + @api.model + def _default_res_model(self): + '''Useful when creating stages from a Kanban view for another model''' + action_id = self.env.context.get('params', {}).get('action') + action = self.env['ir.actions.act_window'].browse(action_id) + default_model = action.res_model + if default_model != self._name: + return self.env['ir.model'].search([('model', '=', default_model)]) diff --git a/web_kanban_stage/security/ir.model.access.csv b/web_kanban_stage/security/ir.model.access.csv new file mode 100644 index 000000000..afa1cb706 --- /dev/null +++ b/web_kanban_stage/security/ir.model.access.csv @@ -0,0 +1,3 @@ +id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink +access_user,Kanban Stage - User Access,model_web_kanban_stage,base.group_user,1,0,0,0 +access_manager,Kanban Stage - Manager Access,model_web_kanban_stage,base.group_erp_manager,1,1,1,1 diff --git a/web_kanban_stage/static/description/icon.png b/web_kanban_stage/static/description/icon.png new file mode 100644 index 0000000000000000000000000000000000000000..3a0328b516c4980e8e44cdb63fd945757ddd132d GIT binary patch literal 9455 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 z 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 Xviia!U7SGha1wx#SCgwmn*{w2TRX*I literal 0 HcmV?d00001 diff --git a/web_kanban_stage/tests/__init__.py b/web_kanban_stage/tests/__init__.py new file mode 100644 index 000000000..09868d7c5 --- /dev/null +++ b/web_kanban_stage/tests/__init__.py @@ -0,0 +1,6 @@ +# -*- coding: utf-8 -*- +# Copyright 2016 LasLabs Inc. +# License LGPL-3.0 or later (http://www.gnu.org/licenses/lgpl.html). + +from . import test_web_kanban_abstract +from . import test_web_kanban_stage diff --git a/web_kanban_stage/tests/test_web_kanban_abstract.py b/web_kanban_stage/tests/test_web_kanban_abstract.py new file mode 100644 index 000000000..6a8a52faf --- /dev/null +++ b/web_kanban_stage/tests/test_web_kanban_abstract.py @@ -0,0 +1,66 @@ +# -*- coding: utf-8 -*- +# Copyright 2016 LasLabs Inc. +# License LGPL-3.0 or later (http://www.gnu.org/licenses/lgpl.html). + +from openerp import models +from openerp.tests.common import TransactionCase + + +class WebKanbanAbstractTester(models.Model): + _name = 'web.kanban.abstract.tester' + _inherit = 'web.kanban.abstract' + + +class TestWebKanbanAbstract(TransactionCase): + def setUp(self): + super(TestWebKanbanAbstract, self).setUp() + + WebKanbanAbstractTester._build_model(self.registry, self.cr) + self.test_model = self.env[WebKanbanAbstractTester._name] + + test_model_type = self.env['ir.model'].create({ + 'model': WebKanbanAbstractTester._name, + 'name': 'Kanban Abstract - Test Model', + 'state': 'base', + }) + + test_stage_1 = self.env['web.kanban.stage'].create({ + 'name': 'Test Stage 1', + 'res_model': test_model_type.id, + }) + test_stage_2 = self.env['web.kanban.stage'].create({ + 'name': 'Test Stage 2', + 'res_model': test_model_type.id, + 'fold': True, + }) + + self.id_1 = test_stage_1.id + self.id_2 = test_stage_2.id + + def test_read_group_stage_ids_base_case(self): + '''It should return a structure with the proper content''' + self.assertEqual( + self.test_model._read_group_stage_ids(), + ( + [(self.id_1, 'Test Stage 1'), (self.id_2, 'Test Stage 2')], + {self.id_1: False, self.id_2: True}, + ) + ) + + def test_read_group_stage_ids_correct_associated_model(self): + '''It should only return info for stages with right associated model''' + stage_model = self.env['ir.model'].search([ + ('model', '=', 'web.kanban.stage'), + ]) + self.env['web.kanban.stage'].create({ + 'name': 'Test Stage 3', + 'res_model': stage_model.id, + }) + + self.assertEqual( + self.test_model._read_group_stage_ids(), + ( + [(self.id_1, 'Test Stage 1'), (self.id_2, 'Test Stage 2')], + {self.id_1: False, self.id_2: True}, + ) + ) diff --git a/web_kanban_stage/tests/test_web_kanban_stage.py b/web_kanban_stage/tests/test_web_kanban_stage.py new file mode 100644 index 000000000..831e25b68 --- /dev/null +++ b/web_kanban_stage/tests/test_web_kanban_stage.py @@ -0,0 +1,50 @@ +# -*- coding: utf-8 -*- +# Copyright 2016 LasLabs Inc. +# License LGPL-3.0 or later (http://www.gnu.org/licenses/lgpl.html). + +from openerp.tests.common import TransactionCase + + +class TestWebKanbanStage(TransactionCase): + def test_default_res_model_no_params(self): + '''It should return empty ir.model recordset if no params in context''' + test_stage = self.env['web.kanban.stage'].with_context({}) + res_model = test_stage._default_res_model() + + self.assertFalse(res_model) + self.assertEqual(res_model._name, 'ir.model') + + def test_default_res_model_no_action(self): + '''It should return empty ir.model recordset if no action in params''' + test_stage = self.env['web.kanban.stage'].with_context(params={}) + res_model = test_stage._default_res_model() + + self.assertFalse(res_model) + self.assertEqual(res_model._name, 'ir.model') + + def test_default_res_model_info_in_context(self): + '''It should return correct ir.model record if info in context''' + test_action = self.env['ir.actions.act_window'].create({ + 'name': 'Test Action', + 'res_model': 'res.users', + }) + test_stage = self.env['web.kanban.stage'].with_context( + params={'action': test_action.id}, + ) + + self.assertEqual( + test_stage._default_res_model(), + self.env['ir.model'].search([('model', '=', 'res.users')]) + ) + + def test_default_res_model_ignore_self(self): + '''It should not return ir.model record corresponding to stage model''' + test_action = self.env['ir.actions.act_window'].create({ + 'name': 'Test Action', + 'res_model': 'web.kanban.stage', + }) + test_stage = self.env['web.kanban.stage'].with_context( + params={'action': test_action.id}, + ) + + self.assertFalse(test_stage._default_res_model()) diff --git a/web_kanban_stage/views/web_kanban_abstract.xml b/web_kanban_stage/views/web_kanban_abstract.xml new file mode 100644 index 000000000..de59bf1da --- /dev/null +++ b/web_kanban_stage/views/web_kanban_abstract.xml @@ -0,0 +1,64 @@ + + + + + + + Kanban Abstract - Base Kanban View + web.kanban.abstract + + + + + + + + + + + + + +
+
+ + + +
+
+ + +
+
+ +
+
+
+ +
+
+ +
+
+
+ + + + + + diff --git a/web_kanban_stage/views/web_kanban_stage.xml b/web_kanban_stage/views/web_kanban_stage.xml new file mode 100644 index 000000000..91316f4ea --- /dev/null +++ b/web_kanban_stage/views/web_kanban_stage.xml @@ -0,0 +1,71 @@ + + + + + + + Kanban Stage - Form View + web.kanban.stage + +
+
+ + + + + + + + + + + + + + + + + + + + + Kanban Stages - Tree View + web.kanban.stage + + + + + + + + + + + Kanban Stages - Search View + web.kanban.stage + + + + + + + + + + + Kanban Stages + web.kanban.stage + ir.actions.act_window + form + tree,form + + + + + + From a907392f74aa048a0ba492c6ca47245b24bd60a5 Mon Sep 17 00:00:00 2001 From: Ted Salmon Date: Wed, 28 Dec 2016 12:00:43 -0800 Subject: [PATCH 2/7] [ADD] base_kanban_stage: Stage model and abstract logic * Add Kanban-compatible stage model base.kanban.stage * Add views, menu items, actions, and access controls needed to manage base.kanban.stage records * Add abstract model base.kanban.abstract that other models can inherit from to gain Kanban stage functionality * Add base Kanban view base_kanban_abstract_view_kanban, which can be customized as needed for use with models that inherit from base.kanban.abstract * Add model base.kanban.abstract.tester, which is needed for base.kanban.abstract unit tests --- .../README.rst | 16 ++++----- .../__init__.py | 0 .../__openerp__.py | 6 ++-- .../models/__init__.py | 4 +-- .../models/base_kanban_abstract.py | 10 +++--- .../models/base_kanban_stage.py | 4 +-- .../security/ir.model.access.csv | 3 ++ .../static/description/icon.png | Bin .../tests/__init__.py | 4 +-- .../tests/test_base_kanban_abstract.py | 31 +++++++++++------- .../tests/test_base_kanban_stage.py | 16 ++++----- .../views/base_kanban_abstract.xml | 4 +-- .../views/base_kanban_stage.xml | 23 ++++++------- web_kanban_stage/security/ir.model.access.csv | 3 -- 14 files changed, 66 insertions(+), 58 deletions(-) rename {web_kanban_stage => base_kanban_stage}/README.rst (81%) rename {web_kanban_stage => base_kanban_stage}/__init__.py (100%) rename {web_kanban_stage => base_kanban_stage}/__openerp__.py (83%) rename {web_kanban_stage => base_kanban_stage}/models/__init__.py (64%) rename web_kanban_stage/models/web_kanban_abstract.py => base_kanban_stage/models/base_kanban_abstract.py (94%) rename web_kanban_stage/models/web_kanban_stage.py => base_kanban_stage/models/base_kanban_stage.py (97%) create mode 100644 base_kanban_stage/security/ir.model.access.csv rename {web_kanban_stage => base_kanban_stage}/static/description/icon.png (100%) rename {web_kanban_stage => base_kanban_stage}/tests/__init__.py (61%) rename web_kanban_stage/tests/test_web_kanban_abstract.py => base_kanban_stage/tests/test_base_kanban_abstract.py (64%) rename web_kanban_stage/tests/test_web_kanban_stage.py => base_kanban_stage/tests/test_base_kanban_stage.py (74%) rename web_kanban_stage/views/web_kanban_abstract.xml => base_kanban_stage/views/base_kanban_abstract.xml (96%) rename web_kanban_stage/views/web_kanban_stage.xml => base_kanban_stage/views/base_kanban_stage.xml (74%) delete mode 100644 web_kanban_stage/security/ir.model.access.csv diff --git a/web_kanban_stage/README.rst b/base_kanban_stage/README.rst similarity index 81% rename from web_kanban_stage/README.rst rename to base_kanban_stage/README.rst index 6c1982f61..8d2563d4e 100644 --- a/web_kanban_stage/README.rst +++ b/base_kanban_stage/README.rst @@ -8,7 +8,7 @@ Kanban - Stage Support This module provides a stage model compatible with Kanban views and the standard views needed to manage these stages. It also provides the -``web.kanban.abstract`` model, which can be inherited to add support for +``base.kanban.abstract`` model, which can be inherited to add support for Kanban views with stages to any other model. Lastly, it includes a base Kanban view that can be extended as needed. @@ -25,16 +25,16 @@ No configuration is needed or possible. Usage ===== -* Inherit from ``web.kanban.abstract`` to add Kanban stage functionality to +* Inherit from ``base.kanban.abstract`` to add Kanban stage functionality to the child model: .. code-block:: python class MyModel(models.Model): _name = 'my.model' - _inherit = 'web.kanban.abstract' + _inherit = 'base.kanban.abstract' -* Extend the provided base Kanban view (``web_kanban_abstract_view_kanban``) +* Extend the provided base Kanban view (``base_kanban_abstract_view_kanban``) as needed by the child model. The base view has four ``name`` attributes intended to provide convenient XPath access to different parts of the Kanban card. They are ``card_dropdown_menu``, ``card_header``, ``card_body``, and @@ -45,7 +45,7 @@ Usage My Model - Kanban View my.model - + @@ -65,14 +65,14 @@ Usage Known Issues / Roadmap ====================== -* The grouping logic used by ``web.kanban.abstract`` currently does not +* The grouping logic used by ``base.kanban.abstract`` currently does not support additional domains and alternate sort orders Bug Tracker =========== -Bugs are tracked on `GitHub Issues `_. In -case of trouble, please check there if your issue has already been reported. +Bugs are tracked on `GitHub Issues `_. +In case of trouble, please check there if your issue has already been reported. If you spotted it first, help us smash it by providing detailed and welcomed feedback. diff --git a/web_kanban_stage/__init__.py b/base_kanban_stage/__init__.py similarity index 100% rename from web_kanban_stage/__init__.py rename to base_kanban_stage/__init__.py diff --git a/web_kanban_stage/__openerp__.py b/base_kanban_stage/__openerp__.py similarity index 83% rename from web_kanban_stage/__openerp__.py rename to base_kanban_stage/__openerp__.py index 86ab22b79..eeec97fa3 100644 --- a/web_kanban_stage/__openerp__.py +++ b/base_kanban_stage/__openerp__.py @@ -7,7 +7,7 @@ 'summary': 'Provides stage model and abstract logic for inheritance', 'version': '9.0.1.0.0', 'author': "LasLabs, Odoo Community Association (OCA)", - 'category': 'Web', + 'category': 'base', 'depends': [ 'web_kanban', ], @@ -15,8 +15,8 @@ 'license': 'LGPL-3', 'data': [ 'security/ir.model.access.csv', - 'views/web_kanban_abstract.xml', - 'views/web_kanban_stage.xml', + 'views/base_kanban_abstract.xml', + 'views/base_kanban_stage.xml', ], 'installable': True, 'application': False, diff --git a/web_kanban_stage/models/__init__.py b/base_kanban_stage/models/__init__.py similarity index 64% rename from web_kanban_stage/models/__init__.py rename to base_kanban_stage/models/__init__.py index 1b31900ee..abde8b5bd 100644 --- a/web_kanban_stage/models/__init__.py +++ b/base_kanban_stage/models/__init__.py @@ -2,5 +2,5 @@ # Copyright 2016 LasLabs Inc. # License LGPL-3.0 or later (http://www.gnu.org/licenses/lgpl.html). -from . import web_kanban_abstract -from . import web_kanban_stage +from . import base_kanban_abstract +from . import base_kanban_stage diff --git a/web_kanban_stage/models/web_kanban_abstract.py b/base_kanban_stage/models/base_kanban_abstract.py similarity index 94% rename from web_kanban_stage/models/web_kanban_abstract.py rename to base_kanban_stage/models/base_kanban_abstract.py index 67cebef28..2c699f18e 100644 --- a/web_kanban_stage/models/web_kanban_abstract.py +++ b/base_kanban_stage/models/base_kanban_abstract.py @@ -5,13 +5,13 @@ from openerp import api, fields, models -class WebKanbanAbstract(models.AbstractModel): +class BaseKanbanAbstract(models.AbstractModel): '''Inherit from this class to add support for Kanban stages to your model. All public properties are preceded with kanban_ in order to isolate from child models, with the exception of stage_id, which is a required field in the Kanban widget and must be defined as such.''' - _name = 'web.kanban.abstract' + _name = 'base.kanban.abstract' _order = 'kanban_priority desc, kanban_sequence' _group_by_full = { 'stage_id': lambda s, *a, **k: s._read_group_stage_ids(*a, **k), @@ -31,7 +31,7 @@ class WebKanbanAbstract(models.AbstractModel): ) stage_id = fields.Many2one( string='Kanban Stage', - comodel_name='web.kanban.stage', + comodel_name='base.kanban.stage', track_visibility='onchange', index=True, copy=False, @@ -99,13 +99,13 @@ class WebKanbanAbstract(models.AbstractModel): @api.model def _default_stage_id(self): - return + return self.env['base.kanban.stage'] @api.multi def _read_group_stage_ids( self, domain=None, read_group_order=None, access_rights_uid=None ): - stage_model = self.env['web.kanban.stage'].sudo(access_rights_uid) + stage_model = self.env['base.kanban.stage'].sudo(access_rights_uid) stages = stage_model.search([('res_model.model', '=', self._name)]) names = [(r.id, r.display_name) for r in stages] fold = {r.id: r.fold for r in stages} diff --git a/web_kanban_stage/models/web_kanban_stage.py b/base_kanban_stage/models/base_kanban_stage.py similarity index 97% rename from web_kanban_stage/models/web_kanban_stage.py rename to base_kanban_stage/models/base_kanban_stage.py index b40a7aaf3..046fb5a65 100644 --- a/web_kanban_stage/models/web_kanban_stage.py +++ b/base_kanban_stage/models/base_kanban_stage.py @@ -5,8 +5,8 @@ from openerp import api, fields, models -class WebKanbanStage(models.Model): - _name = 'web.kanban.stage' +class BaseKanbanStage(models.Model): + _name = 'base.kanban.stage' _description = 'Kanban Stage' _order = 'res_model, sequence' diff --git a/base_kanban_stage/security/ir.model.access.csv b/base_kanban_stage/security/ir.model.access.csv new file mode 100644 index 000000000..b47795a31 --- /dev/null +++ b/base_kanban_stage/security/ir.model.access.csv @@ -0,0 +1,3 @@ +id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink +access_user,Kanban Stage - User Access,model_base_kanban_stage,base.group_user,1,0,0,0 +access_manager,Kanban Stage - Manager Access,model_base_kanban_stage,base.group_erp_manager,1,1,1,1 diff --git a/web_kanban_stage/static/description/icon.png b/base_kanban_stage/static/description/icon.png similarity index 100% rename from web_kanban_stage/static/description/icon.png rename to base_kanban_stage/static/description/icon.png diff --git a/web_kanban_stage/tests/__init__.py b/base_kanban_stage/tests/__init__.py similarity index 61% rename from web_kanban_stage/tests/__init__.py rename to base_kanban_stage/tests/__init__.py index 09868d7c5..05cdecf9a 100644 --- a/web_kanban_stage/tests/__init__.py +++ b/base_kanban_stage/tests/__init__.py @@ -2,5 +2,5 @@ # Copyright 2016 LasLabs Inc. # License LGPL-3.0 or later (http://www.gnu.org/licenses/lgpl.html). -from . import test_web_kanban_abstract -from . import test_web_kanban_stage +from . import test_base_kanban_abstract +from . import test_base_kanban_stage diff --git a/web_kanban_stage/tests/test_web_kanban_abstract.py b/base_kanban_stage/tests/test_base_kanban_abstract.py similarity index 64% rename from web_kanban_stage/tests/test_web_kanban_abstract.py rename to base_kanban_stage/tests/test_base_kanban_abstract.py index 6a8a52faf..e11291722 100644 --- a/web_kanban_stage/tests/test_web_kanban_abstract.py +++ b/base_kanban_stage/tests/test_base_kanban_abstract.py @@ -6,29 +6,29 @@ from openerp import models from openerp.tests.common import TransactionCase -class WebKanbanAbstractTester(models.Model): - _name = 'web.kanban.abstract.tester' - _inherit = 'web.kanban.abstract' +class BaseKanbanAbstractTester(models.Model): + _name = 'base.kanban.abstract.tester' + _inherit = 'base.kanban.abstract' -class TestWebKanbanAbstract(TransactionCase): +class TestBaseKanbanAbstract(TransactionCase): def setUp(self): - super(TestWebKanbanAbstract, self).setUp() + super(TestBaseKanbanAbstract, self).setUp() - WebKanbanAbstractTester._build_model(self.registry, self.cr) - self.test_model = self.env[WebKanbanAbstractTester._name] + BaseKanbanAbstractTester._build_model(self.registry, self.cr) + self.test_model = self.env[BaseKanbanAbstractTester._name] test_model_type = self.env['ir.model'].create({ - 'model': WebKanbanAbstractTester._name, + 'model': BaseKanbanAbstractTester._name, 'name': 'Kanban Abstract - Test Model', 'state': 'base', }) - test_stage_1 = self.env['web.kanban.stage'].create({ + test_stage_1 = self.env['base.kanban.stage'].create({ 'name': 'Test Stage 1', 'res_model': test_model_type.id, }) - test_stage_2 = self.env['web.kanban.stage'].create({ + test_stage_2 = self.env['base.kanban.stage'].create({ 'name': 'Test Stage 2', 'res_model': test_model_type.id, 'fold': True, @@ -50,9 +50,9 @@ class TestWebKanbanAbstract(TransactionCase): def test_read_group_stage_ids_correct_associated_model(self): '''It should only return info for stages with right associated model''' stage_model = self.env['ir.model'].search([ - ('model', '=', 'web.kanban.stage'), + ('model', '=', 'base.kanban.stage'), ]) - self.env['web.kanban.stage'].create({ + self.env['base.kanban.stage'].create({ 'name': 'Test Stage 3', 'res_model': stage_model.id, }) @@ -64,3 +64,10 @@ class TestWebKanbanAbstract(TransactionCase): {self.id_1: False, self.id_2: True}, ) ) + + def test_default_stage_id(self): + ''' It should return an empty RecordSet ''' + self.assertEqual( + self.env['base.kanban.abstract']._default_stage_id(), + self.env['base.kanban.stage'] + ) diff --git a/web_kanban_stage/tests/test_web_kanban_stage.py b/base_kanban_stage/tests/test_base_kanban_stage.py similarity index 74% rename from web_kanban_stage/tests/test_web_kanban_stage.py rename to base_kanban_stage/tests/test_base_kanban_stage.py index 831e25b68..7e089ff7b 100644 --- a/web_kanban_stage/tests/test_web_kanban_stage.py +++ b/base_kanban_stage/tests/test_base_kanban_stage.py @@ -5,18 +5,18 @@ from openerp.tests.common import TransactionCase -class TestWebKanbanStage(TransactionCase): +class TestBaseKanbanStage(TransactionCase): def test_default_res_model_no_params(self): - '''It should return empty ir.model recordset if no params in context''' - test_stage = self.env['web.kanban.stage'].with_context({}) + '''It should return empty ir.model Recordset if no params in context''' + test_stage = self.env['base.kanban.stage'].with_context({}) res_model = test_stage._default_res_model() self.assertFalse(res_model) self.assertEqual(res_model._name, 'ir.model') def test_default_res_model_no_action(self): - '''It should return empty ir.model recordset if no action in params''' - test_stage = self.env['web.kanban.stage'].with_context(params={}) + '''It should return empty ir.model Recordset if no action in params''' + test_stage = self.env['base.kanban.stage'].with_context(params={}) res_model = test_stage._default_res_model() self.assertFalse(res_model) @@ -28,7 +28,7 @@ class TestWebKanbanStage(TransactionCase): 'name': 'Test Action', 'res_model': 'res.users', }) - test_stage = self.env['web.kanban.stage'].with_context( + test_stage = self.env['base.kanban.stage'].with_context( params={'action': test_action.id}, ) @@ -41,9 +41,9 @@ class TestWebKanbanStage(TransactionCase): '''It should not return ir.model record corresponding to stage model''' test_action = self.env['ir.actions.act_window'].create({ 'name': 'Test Action', - 'res_model': 'web.kanban.stage', + 'res_model': 'base.kanban.stage', }) - test_stage = self.env['web.kanban.stage'].with_context( + test_stage = self.env['base.kanban.stage'].with_context( params={'action': test_action.id}, ) diff --git a/web_kanban_stage/views/web_kanban_abstract.xml b/base_kanban_stage/views/base_kanban_abstract.xml similarity index 96% rename from web_kanban_stage/views/web_kanban_abstract.xml rename to base_kanban_stage/views/base_kanban_abstract.xml index de59bf1da..5f5615f9e 100644 --- a/web_kanban_stage/views/web_kanban_abstract.xml +++ b/base_kanban_stage/views/base_kanban_abstract.xml @@ -6,9 +6,9 @@ --> - + Kanban Abstract - Base Kanban View - web.kanban.abstract + base.kanban.abstract diff --git a/web_kanban_stage/views/web_kanban_stage.xml b/base_kanban_stage/views/base_kanban_stage.xml similarity index 74% rename from web_kanban_stage/views/web_kanban_stage.xml rename to base_kanban_stage/views/base_kanban_stage.xml index 91316f4ea..cc99617cf 100644 --- a/web_kanban_stage/views/web_kanban_stage.xml +++ b/base_kanban_stage/views/base_kanban_stage.xml @@ -6,9 +6,9 @@ --> - + Kanban Stage - Form View - web.kanban.stage + base.kanban.stage
@@ -31,9 +31,9 @@ - + Kanban Stages - Tree View - web.kanban.stage + base.kanban.stage @@ -43,9 +43,9 @@ - + Kanban Stages - Search View - web.kanban.stage + base.kanban.stage @@ -55,17 +55,18 @@ - + Kanban Stages - web.kanban.stage + base.kanban.stage ir.actions.act_window form tree,form - - + diff --git a/web_kanban_stage/security/ir.model.access.csv b/web_kanban_stage/security/ir.model.access.csv deleted file mode 100644 index afa1cb706..000000000 --- a/web_kanban_stage/security/ir.model.access.csv +++ /dev/null @@ -1,3 +0,0 @@ -id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink -access_user,Kanban Stage - User Access,model_web_kanban_stage,base.group_user,1,0,0,0 -access_manager,Kanban Stage - Manager Access,model_web_kanban_stage,base.group_erp_manager,1,1,1,1 From 2b2666a7ce768c5f95e52c7eb71bb1b6afc6dd6a Mon Sep 17 00:00:00 2001 From: Dave Lasley Date: Thu, 29 Dec 2016 16:06:56 -0800 Subject: [PATCH 3/7] [MIG] base_kanban_stage: Upgrade to v10 * Rename manifest * Change openerp references to odoo * Bump version --- base_kanban_stage/README.rst | 2 +- base_kanban_stage/{__openerp__.py => __manifest__.py} | 2 +- base_kanban_stage/models/base_kanban_abstract.py | 2 +- base_kanban_stage/models/base_kanban_stage.py | 2 +- base_kanban_stage/tests/test_base_kanban_abstract.py | 4 ++-- base_kanban_stage/tests/test_base_kanban_stage.py | 2 +- 6 files changed, 7 insertions(+), 7 deletions(-) rename base_kanban_stage/{__openerp__.py => __manifest__.py} (95%) diff --git a/base_kanban_stage/README.rst b/base_kanban_stage/README.rst index 8d2563d4e..7fe39570c 100644 --- a/base_kanban_stage/README.rst +++ b/base_kanban_stage/README.rst @@ -60,7 +60,7 @@ Usage .. image:: https://odoo-community.org/website/image/ir.attachment/5784_f2813bd/datas :alt: Try me on Runbot - :target: https://runbot.odoo-community.org/runbot/162/9.0 + :target: https://runbot.odoo-community.org/runbot/162/10.0 Known Issues / Roadmap ====================== diff --git a/base_kanban_stage/__openerp__.py b/base_kanban_stage/__manifest__.py similarity index 95% rename from base_kanban_stage/__openerp__.py rename to base_kanban_stage/__manifest__.py index eeec97fa3..213f9b6d8 100644 --- a/base_kanban_stage/__openerp__.py +++ b/base_kanban_stage/__manifest__.py @@ -5,7 +5,7 @@ { 'name': 'Kanban - Stage Support', 'summary': 'Provides stage model and abstract logic for inheritance', - 'version': '9.0.1.0.0', + 'version': '10.0.1.0.0', 'author': "LasLabs, Odoo Community Association (OCA)", 'category': 'base', 'depends': [ diff --git a/base_kanban_stage/models/base_kanban_abstract.py b/base_kanban_stage/models/base_kanban_abstract.py index 2c699f18e..d1b03901c 100644 --- a/base_kanban_stage/models/base_kanban_abstract.py +++ b/base_kanban_stage/models/base_kanban_abstract.py @@ -2,7 +2,7 @@ # Copyright 2016 LasLabs Inc. # License LGPL-3.0 or later (http://www.gnu.org/licenses/lgpl.html). -from openerp import api, fields, models +from odoo import api, fields, models class BaseKanbanAbstract(models.AbstractModel): diff --git a/base_kanban_stage/models/base_kanban_stage.py b/base_kanban_stage/models/base_kanban_stage.py index 046fb5a65..adfb0e2ed 100644 --- a/base_kanban_stage/models/base_kanban_stage.py +++ b/base_kanban_stage/models/base_kanban_stage.py @@ -2,7 +2,7 @@ # Copyright 2016 LasLabs Inc. # License LGPL-3.0 or later (http://www.gnu.org/licenses/lgpl.html). -from openerp import api, fields, models +from odoo import api, fields, models class BaseKanbanStage(models.Model): diff --git a/base_kanban_stage/tests/test_base_kanban_abstract.py b/base_kanban_stage/tests/test_base_kanban_abstract.py index e11291722..848718b5f 100644 --- a/base_kanban_stage/tests/test_base_kanban_abstract.py +++ b/base_kanban_stage/tests/test_base_kanban_abstract.py @@ -2,8 +2,8 @@ # Copyright 2016 LasLabs Inc. # License LGPL-3.0 or later (http://www.gnu.org/licenses/lgpl.html). -from openerp import models -from openerp.tests.common import TransactionCase +from odoo import models +from odoo.tests.common import TransactionCase class BaseKanbanAbstractTester(models.Model): diff --git a/base_kanban_stage/tests/test_base_kanban_stage.py b/base_kanban_stage/tests/test_base_kanban_stage.py index 7e089ff7b..e60a6669a 100644 --- a/base_kanban_stage/tests/test_base_kanban_stage.py +++ b/base_kanban_stage/tests/test_base_kanban_stage.py @@ -2,7 +2,7 @@ # Copyright 2016 LasLabs Inc. # License LGPL-3.0 or later (http://www.gnu.org/licenses/lgpl.html). -from openerp.tests.common import TransactionCase +from odoo.tests.common import TransactionCase class TestBaseKanbanStage(TransactionCase): From ae39fb398c2af878996888ef5906818555dc40f6 Mon Sep 17 00:00:00 2001 From: Ted Salmon Date: Tue, 3 Jan 2017 13:23:54 -0800 Subject: [PATCH 4/7] IMP] base_kanban_stage: Updates per PR * Update depends to `base` * Update priority selections to match Odoo guidelines * Update comment block to triple double quotes * Update `kanban_user_id` to `user_id` in code and view * Update README to incorporate use of mode in example view --- base_kanban_stage/README.rst | 12 +++++++----- base_kanban_stage/__manifest__.py | 2 +- base_kanban_stage/models/base_kanban_abstract.py | 12 +++++++----- base_kanban_stage/views/base_kanban_abstract.xml | 2 +- 4 files changed, 16 insertions(+), 12 deletions(-) diff --git a/base_kanban_stage/README.rst b/base_kanban_stage/README.rst index 7fe39570c..8f683f429 100644 --- a/base_kanban_stage/README.rst +++ b/base_kanban_stage/README.rst @@ -35,16 +35,18 @@ Usage _inherit = 'base.kanban.abstract' * Extend the provided base Kanban view (``base_kanban_abstract_view_kanban``) - as needed by the child model. The base view has four ``name`` attributes - intended to provide convenient XPath access to different parts of the Kanban - card. They are ``card_dropdown_menu``, ``card_header``, ``card_body``, and - ``card_footer``: + as needed by the child model while making sure to set the ``mode`` to + ``primary`` so that inheritance works properly. The base view has four + ``name`` attributes intended to provide convenient XPath access to different + parts of the Kanban card. They are ``card_dropdown_menu``, ``card_header``, + ``card_body``, and ``card_footer``: .. code-block:: xml My Model - Kanban View my.model + primary @@ -90,7 +92,7 @@ Contributors * Dave Lasley * Oleg Bulkin -* Daniel Reis +* Daniel Reis Maintainer ---------- diff --git a/base_kanban_stage/__manifest__.py b/base_kanban_stage/__manifest__.py index 213f9b6d8..ecb053f2f 100644 --- a/base_kanban_stage/__manifest__.py +++ b/base_kanban_stage/__manifest__.py @@ -9,7 +9,7 @@ 'author': "LasLabs, Odoo Community Association (OCA)", 'category': 'base', 'depends': [ - 'web_kanban', + 'base', ], 'website': 'https://laslabs.com', 'license': 'LGPL-3', diff --git a/base_kanban_stage/models/base_kanban_abstract.py b/base_kanban_stage/models/base_kanban_abstract.py index d1b03901c..3bcd9e5a2 100644 --- a/base_kanban_stage/models/base_kanban_abstract.py +++ b/base_kanban_stage/models/base_kanban_abstract.py @@ -6,10 +6,10 @@ from odoo import api, fields, models class BaseKanbanAbstract(models.AbstractModel): - '''Inherit from this class to add support for Kanban stages to your model. + """ Inherit from this class to add support for Kanban stages to your model. All public properties are preceded with kanban_ in order to isolate from child models, with the exception of stage_id, which is a required field in - the Kanban widget and must be defined as such.''' + the Kanban widget and must be defined as such. """ _name = 'base.kanban.abstract' _order = 'kanban_priority desc, kanban_sequence' @@ -24,7 +24,7 @@ class BaseKanbanAbstract(models.AbstractModel): ' stage and with the same priority', ) kanban_priority = fields.Selection( - selection=[('0', 'Normal'), ('5', 'Medium'), ('10', 'High')], + selection=[('0', 'Normal'), ('1', 'Medium'), ('2', 'High')], index=True, default='0', help='The priority of the record (shown as stars in Kanban views)', @@ -39,7 +39,7 @@ class BaseKanbanAbstract(models.AbstractModel): default=lambda s: s._default_stage_id(), domain=lambda s: [('res_model.model', '=', s._name)], ) - kanban_user_id = fields.Many2one( + user_id = fields.Many2one( string='Assigned To', comodel_name='res.users', index=True, @@ -105,7 +105,9 @@ class BaseKanbanAbstract(models.AbstractModel): def _read_group_stage_ids( self, domain=None, read_group_order=None, access_rights_uid=None ): - stage_model = self.env['base.kanban.stage'].sudo(access_rights_uid) + stage_model = self.env['base.kanban.stage'] + if access_rights_uid: + stage_model = stage_model.sudo(access_rights_uid) stages = stage_model.search([('res_model.model', '=', self._name)]) names = [(r.id, r.display_name) for r in stages] fold = {r.id: r.fold for r in stages} diff --git a/base_kanban_stage/views/base_kanban_abstract.xml b/base_kanban_stage/views/base_kanban_abstract.xml index 5f5615f9e..984889565 100644 --- a/base_kanban_stage/views/base_kanban_abstract.xml +++ b/base_kanban_stage/views/base_kanban_abstract.xml @@ -19,7 +19,7 @@ - +
From e0d6bb01d69edac2e7051c67c526186802772b41 Mon Sep 17 00:00:00 2001 From: Dave Lasley Date: Sat, 14 Jan 2017 17:52:48 -0800 Subject: [PATCH 5/7] Implement newer abstract test strategy --- .../models/base_kanban_abstract.py | 4 +- base_kanban_stage/models/base_kanban_stage.py | 8 +-- .../tests/test_base_kanban_abstract.py | 62 +++++++++++++------ .../tests/test_base_kanban_stage.py | 24 +++---- base_kanban_stage/views/base_kanban_stage.xml | 6 +- 5 files changed, 65 insertions(+), 39 deletions(-) diff --git a/base_kanban_stage/models/base_kanban_abstract.py b/base_kanban_stage/models/base_kanban_abstract.py index 3bcd9e5a2..94a0d6236 100644 --- a/base_kanban_stage/models/base_kanban_abstract.py +++ b/base_kanban_stage/models/base_kanban_abstract.py @@ -37,7 +37,7 @@ class BaseKanbanAbstract(models.AbstractModel): copy=False, help='The Kanban stage that this record is currently in', default=lambda s: s._default_stage_id(), - domain=lambda s: [('res_model.model', '=', s._name)], + domain=lambda s: [('res_model_id.model', '=', s._name)], ) user_id = fields.Many2one( string='Assigned To', @@ -108,7 +108,7 @@ class BaseKanbanAbstract(models.AbstractModel): stage_model = self.env['base.kanban.stage'] if access_rights_uid: stage_model = stage_model.sudo(access_rights_uid) - stages = stage_model.search([('res_model.model', '=', self._name)]) + stages = stage_model.search([('res_model_id.model', '=', self._name)]) names = [(r.id, r.display_name) for r in stages] fold = {r.id: r.fold for r in stages} return names, fold diff --git a/base_kanban_stage/models/base_kanban_stage.py b/base_kanban_stage/models/base_kanban_stage.py index adfb0e2ed..2ffaa63ec 100644 --- a/base_kanban_stage/models/base_kanban_stage.py +++ b/base_kanban_stage/models/base_kanban_stage.py @@ -8,7 +8,7 @@ from odoo import api, fields, models class BaseKanbanStage(models.Model): _name = 'base.kanban.stage' _description = 'Kanban Stage' - _order = 'res_model, sequence' + _order = 'res_model_id, sequence' name = fields.Char( string='Stage Name', @@ -64,18 +64,18 @@ class BaseKanbanStage(models.Model): help='Determines whether this stage will be collapsed down in Kanban' ' views', ) - res_model = fields.Many2one( + res_model_id = fields.Many2one( string='Associated Model', comodel_name='ir.model', required=True, index=True, help='The model that this Kanban stage will be used for', domain=[('transient', '=', False)], - default=lambda s: s._default_res_model(), + default=lambda s: s._default_res_model_id(), ) @api.model - def _default_res_model(self): + def _default_res_model_id(self): '''Useful when creating stages from a Kanban view for another model''' action_id = self.env.context.get('params', {}).get('action') action = self.env['ir.actions.act_window'].browse(action_id) diff --git a/base_kanban_stage/tests/test_base_kanban_abstract.py b/base_kanban_stage/tests/test_base_kanban_abstract.py index 848718b5f..2c92bf7fd 100644 --- a/base_kanban_stage/tests/test_base_kanban_abstract.py +++ b/base_kanban_stage/tests/test_base_kanban_abstract.py @@ -3,34 +3,60 @@ # License LGPL-3.0 or later (http://www.gnu.org/licenses/lgpl.html). from odoo import models -from odoo.tests.common import TransactionCase +from odoo.tests.common import SavepointCase -class BaseKanbanAbstractTester(models.Model): +class BaseKanbanAbstractTester(models.TransientModel): _name = 'base.kanban.abstract.tester' _inherit = 'base.kanban.abstract' -class TestBaseKanbanAbstract(TransactionCase): - def setUp(self): - super(TestBaseKanbanAbstract, self).setUp() +class TestBaseKanbanAbstract(SavepointCase): - BaseKanbanAbstractTester._build_model(self.registry, self.cr) - self.test_model = self.env[BaseKanbanAbstractTester._name] + @classmethod + def _init_test_model(cls, model_cls): + """ It builds a model from model_cls in order to test abstract models. - test_model_type = self.env['ir.model'].create({ - 'model': BaseKanbanAbstractTester._name, - 'name': 'Kanban Abstract - Test Model', - 'state': 'base', - }) + Note that this does not actually create a table in the database, so + there may be some unidentified edge cases. + + Args: + model_cls (openerp.models.BaseModel): Class of model to initialize + Returns: + model_cls: Instance + """ + registry = cls.env.registry + cr = cls.env.cr + inst = model_cls._build_model(registry, cr) + model = cls.env[model_cls._name].with_context(todo=[]) + model._prepare_setup() + model._setup_base(partial=False) + model._setup_fields(partial=False) + model._setup_complete() + model._auto_init() + model.init() + model._auto_end() + cls.test_model_record = cls.env['ir.model'].search([ + ('name', '=', model._name), + ]) + return inst + + @classmethod + def setUpClass(cls): + super(TestBaseKanbanAbstract, cls).setUpClass() + cls.env.registry.enter_test_mode() + cls._init_test_model(BaseKanbanAbstractTester) + cls.test_model = cls.env[BaseKanbanAbstractTester._name] + def setUp(self): + super(TestBaseKanbanAbstract, self).setUp() test_stage_1 = self.env['base.kanban.stage'].create({ 'name': 'Test Stage 1', - 'res_model': test_model_type.id, + 'res_model_id': self.test_model_record.id, }) test_stage_2 = self.env['base.kanban.stage'].create({ 'name': 'Test Stage 2', - 'res_model': test_model_type.id, + 'res_model_id': self.test_model_record.id, 'fold': True, }) @@ -38,7 +64,7 @@ class TestBaseKanbanAbstract(TransactionCase): self.id_2 = test_stage_2.id def test_read_group_stage_ids_base_case(self): - '''It should return a structure with the proper content''' + """It should return a structure with the proper content""" self.assertEqual( self.test_model._read_group_stage_ids(), ( @@ -48,13 +74,13 @@ class TestBaseKanbanAbstract(TransactionCase): ) def test_read_group_stage_ids_correct_associated_model(self): - '''It should only return info for stages with right associated model''' + """It should only return info for stages with right associated model""" stage_model = self.env['ir.model'].search([ ('model', '=', 'base.kanban.stage'), ]) self.env['base.kanban.stage'].create({ 'name': 'Test Stage 3', - 'res_model': stage_model.id, + 'res_model_id': stage_model.id, }) self.assertEqual( @@ -66,7 +92,7 @@ class TestBaseKanbanAbstract(TransactionCase): ) def test_default_stage_id(self): - ''' It should return an empty RecordSet ''' + """ It should return an empty RecordSet """ self.assertEqual( self.env['base.kanban.abstract']._default_stage_id(), self.env['base.kanban.stage'] diff --git a/base_kanban_stage/tests/test_base_kanban_stage.py b/base_kanban_stage/tests/test_base_kanban_stage.py index e60a6669a..e2d3e9bfa 100644 --- a/base_kanban_stage/tests/test_base_kanban_stage.py +++ b/base_kanban_stage/tests/test_base_kanban_stage.py @@ -6,23 +6,23 @@ from odoo.tests.common import TransactionCase class TestBaseKanbanStage(TransactionCase): - def test_default_res_model_no_params(self): + def test_default_res_model_id_no_params(self): '''It should return empty ir.model Recordset if no params in context''' test_stage = self.env['base.kanban.stage'].with_context({}) - res_model = test_stage._default_res_model() + res_model_id = test_stage._default_res_model_id() - self.assertFalse(res_model) - self.assertEqual(res_model._name, 'ir.model') + self.assertFalse(res_model_id) + self.assertEqual(res_model_id._name, 'ir.model') - def test_default_res_model_no_action(self): + def test_default_res_model_id_no_action(self): '''It should return empty ir.model Recordset if no action in params''' test_stage = self.env['base.kanban.stage'].with_context(params={}) - res_model = test_stage._default_res_model() + res_model_id = test_stage._default_res_model_id() - self.assertFalse(res_model) - self.assertEqual(res_model._name, 'ir.model') + self.assertFalse(res_model_id) + self.assertEqual(res_model_id._name, 'ir.model') - def test_default_res_model_info_in_context(self): + def test_default_res_model_id_info_in_context(self): '''It should return correct ir.model record if info in context''' test_action = self.env['ir.actions.act_window'].create({ 'name': 'Test Action', @@ -33,11 +33,11 @@ class TestBaseKanbanStage(TransactionCase): ) self.assertEqual( - test_stage._default_res_model(), + test_stage._default_res_model_id(), self.env['ir.model'].search([('model', '=', 'res.users')]) ) - def test_default_res_model_ignore_self(self): + def test_default_res_model_id_ignore_self(self): '''It should not return ir.model record corresponding to stage model''' test_action = self.env['ir.actions.act_window'].create({ 'name': 'Test Action', @@ -47,4 +47,4 @@ class TestBaseKanbanStage(TransactionCase): params={'action': test_action.id}, ) - self.assertFalse(test_stage._default_res_model()) + self.assertFalse(test_stage._default_res_model_id()) diff --git a/base_kanban_stage/views/base_kanban_stage.xml b/base_kanban_stage/views/base_kanban_stage.xml index cc99617cf..4a73fb674 100644 --- a/base_kanban_stage/views/base_kanban_stage.xml +++ b/base_kanban_stage/views/base_kanban_stage.xml @@ -15,7 +15,7 @@ - + @@ -37,7 +37,7 @@ - + @@ -49,7 +49,7 @@ - + From f7a390451df2875dc659fb44c669d5c24ee14e20 Mon Sep 17 00:00:00 2001 From: Dave Lasley Date: Thu, 26 Jan 2017 18:42:44 -0800 Subject: [PATCH 6/7] [FIX] base_kanban_stage: Add group_expand & fix method * Add group_expand attr to abstract kanban model, allowing for empty columns * Fix `_read_group_stage_ids` for new API --- base_kanban_stage/models/base_kanban_abstract.py | 16 ++++++---------- 1 file changed, 6 insertions(+), 10 deletions(-) diff --git a/base_kanban_stage/models/base_kanban_abstract.py b/base_kanban_stage/models/base_kanban_abstract.py index 94a0d6236..391c5edda 100644 --- a/base_kanban_stage/models/base_kanban_abstract.py +++ b/base_kanban_stage/models/base_kanban_abstract.py @@ -38,6 +38,7 @@ class BaseKanbanAbstract(models.AbstractModel): help='The Kanban stage that this record is currently in', default=lambda s: s._default_stage_id(), domain=lambda s: [('res_model_id.model', '=', s._name)], + group_expand='_read_group_stage_ids', ) user_id = fields.Many2one( string='Assigned To', @@ -102,13 +103,8 @@ class BaseKanbanAbstract(models.AbstractModel): return self.env['base.kanban.stage'] @api.multi - def _read_group_stage_ids( - self, domain=None, read_group_order=None, access_rights_uid=None - ): - stage_model = self.env['base.kanban.stage'] - if access_rights_uid: - stage_model = stage_model.sudo(access_rights_uid) - stages = stage_model.search([('res_model_id.model', '=', self._name)]) - names = [(r.id, r.display_name) for r in stages] - fold = {r.id: r.fold for r in stages} - return names, fold + def _read_group_stage_ids(self, stages, domain, order): + search_domain = [('res_model_id.model', '=', self._name)] + if domain: + search_domain.extend(domain) + return stages.search(search_domain, order=order) From aebfc5578c5e8d4fdca5065465d6066d588904ba Mon Sep 17 00:00:00 2001 From: Dave Lasley Date: Fri, 27 Jan 2017 10:40:58 -0800 Subject: [PATCH 7/7] [FIX] base_kanban_stage: Fix test for new API --- .../tests/test_base_kanban_abstract.py | 31 ++++--------------- 1 file changed, 6 insertions(+), 25 deletions(-) diff --git a/base_kanban_stage/tests/test_base_kanban_abstract.py b/base_kanban_stage/tests/test_base_kanban_abstract.py index 2c92bf7fd..cf564f7e0 100644 --- a/base_kanban_stage/tests/test_base_kanban_abstract.py +++ b/base_kanban_stage/tests/test_base_kanban_abstract.py @@ -63,32 +63,13 @@ class TestBaseKanbanAbstract(SavepointCase): self.id_1 = test_stage_1.id self.id_2 = test_stage_2.id - def test_read_group_stage_ids_base_case(self): - """It should return a structure with the proper content""" + def test_read_group_stage_ids(self): + """It should return the correct recordset. """ self.assertEqual( - self.test_model._read_group_stage_ids(), - ( - [(self.id_1, 'Test Stage 1'), (self.id_2, 'Test Stage 2')], - {self.id_1: False, self.id_2: True}, - ) - ) - - def test_read_group_stage_ids_correct_associated_model(self): - """It should only return info for stages with right associated model""" - stage_model = self.env['ir.model'].search([ - ('model', '=', 'base.kanban.stage'), - ]) - self.env['base.kanban.stage'].create({ - 'name': 'Test Stage 3', - 'res_model_id': stage_model.id, - }) - - self.assertEqual( - self.test_model._read_group_stage_ids(), - ( - [(self.id_1, 'Test Stage 1'), (self.id_2, 'Test Stage 2')], - {self.id_1: False, self.id_2: True}, - ) + self.test_model._read_group_stage_ids( + self.env['base.kanban.stage'], [], 'id', + ), + self.env['base.kanban.stage'].search([], order='id'), ) def test_default_stage_id(self):