From 11cd84317d5f40a68d5286ce581ce9c141afcd85 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?R=C3=A9my=20Baranx=20=28bar=29?= Date: Wed, 26 Feb 2020 13:03:10 +0000 Subject: [PATCH] [IMP] pad_project: collaborative pads in portal When the 'collaborative pads' option is activated for a project, and the visibility is set to 'portal users', it is possible to define the access level to pads to edit task descriptions. - If set to 'internal users', the behavior stays the same. - If set to 'portal users', a portal user has access to a pad to edit task descriptions on the portal. When configured for portal users access, by default, the task description is displayed with an 'edit' button on top of it. On 'edit' button click, the page is re-rendered with an additional url parmater 'edit=1' to switch to edit mode. In edit mode, the task description is shown in a collaborative pad, with a 'Save' button on top of it. On 'save' button click, the page is re-rendered with the 'edit' url parameter, to switch in classic mode (read-only). TaskID: 2204379 [IMP] project: collaborative pads in portal In order to be (easily) able to add buttons to the right of the description title, the description title is put inside a d-flex div. closes odoo/odoo#46591 Signed-off-by: Yannick Tivisse (yti) --- addons/pad_project/__manifest__.py | 4 ++- addons/pad_project/models/project.py | 35 ++++++++++++++++++- .../static/src/css/pad_project.css | 10 ++++++ .../views/project_portal_assets.xml | 8 +++++ .../views/project_portal_templates.xml | 34 ++++++++++++++++++ addons/pad_project/views/project_views.xml | 6 ++++ .../views/project_portal_templates.xml | 4 ++- 7 files changed, 98 insertions(+), 3 deletions(-) create mode 100644 addons/pad_project/static/src/css/pad_project.css create mode 100644 addons/pad_project/views/project_portal_assets.xml create mode 100644 addons/pad_project/views/project_portal_templates.xml diff --git a/addons/pad_project/__manifest__.py b/addons/pad_project/__manifest__.py index 846b98c68ba..142784a1c91 100644 --- a/addons/pad_project/__manifest__.py +++ b/addons/pad_project/__manifest__.py @@ -14,7 +14,9 @@ This module adds a PAD in all project form views. ], 'data': [ 'views/res_config_settings_views.xml', - 'views/project_views.xml' + 'views/project_views.xml', + 'views/project_portal_templates.xml', + 'views/project_portal_assets.xml' ], 'auto_install': True, } diff --git a/addons/pad_project/models/project.py b/addons/pad_project/models/project.py index 40cfbfdbf10..8c58209a200 100644 --- a/addons/pad_project/models/project.py +++ b/addons/pad_project/models/project.py @@ -11,6 +11,10 @@ class ProjectTask(models.Model): description_pad = fields.Char('Pad URL', pad_content_field='description', copy=False) use_pad = fields.Boolean(related="project_id.use_pads", string="Use collaborative pad", readonly=True) + pad_availability = fields.Selection( + related="project_id.pad_availability", + string="Availability of collaborative pads", + readonly=True) @api.model def create(self, vals): @@ -20,8 +24,37 @@ class ProjectTask(models.Model): self = self.with_context(pad_no_create=True) return super(ProjectTask, self).create(vals) + def _use_portal_pad(self): + """ + Indicates if the task configuration requires to provide + an access to a portal pad. + """ + self.ensure_one() + return self.use_pad and self.pad_availability == 'portal' + + def _get_pad_content(self): + """ + Gets the content of the pad used to edit the task description + and returns it. + """ + self.ensure_one() + return self.pad_get_content(self.description_pad) + class ProjectProject(models.Model): _inherit = "project.project" - use_pads = fields.Boolean("Use collaborative pads", default=True, help="Use collaborative pad for the tasks on this project.") + use_pads = fields.Boolean("Use collaborative pads", default=True, + help="Use collaborative pad for the tasks on this project.") + + pad_availability = fields.Selection([ + ('internal', 'Internal Users'), + ('portal', 'Portal Users') + ], compute='_compute_pad_availability', store=True, readonly=False, + string='Availability of collaborative pads', required=True, default='internal') + + @api.depends('use_pads', 'privacy_visibility') + def _compute_pad_availability(self): + for project in self: + if project.privacy_visibility != 'portal' or not project.use_pads: + project.pad_availability = 'internal' diff --git a/addons/pad_project/static/src/css/pad_project.css b/addons/pad_project/static/src/css/pad_project.css new file mode 100644 index 00000000000..90a8b3de2cb --- /dev/null +++ b/addons/pad_project/static/src/css/pad_project.css @@ -0,0 +1,10 @@ +.o_pad_project_container { + border: solid 1px #c4c4c4; + height:500px; + padding: 0.5rem; + -webkit-box-shadow: 0 5px 10px rgba(0,0,0,0.1); + -moz-box-shadow: 0 5px 10px rgba(0,0,0,0.1); + -ms-box-shadow: 0 5px 10px rgba(0,0,0,0.1); + -o-box-shadow: 0 5px 10px rgba(0,0,0,0.1); + box-shadow: 0 5px 10px rgba(0,0,0,0.1); +} diff --git a/addons/pad_project/views/project_portal_assets.xml b/addons/pad_project/views/project_portal_assets.xml new file mode 100644 index 00000000000..ef773412517 --- /dev/null +++ b/addons/pad_project/views/project_portal_assets.xml @@ -0,0 +1,8 @@ + + + + diff --git a/addons/pad_project/views/project_portal_templates.xml b/addons/pad_project/views/project_portal_templates.xml new file mode 100644 index 00000000000..6981aaf1430 --- /dev/null +++ b/addons/pad_project/views/project_portal_templates.xml @@ -0,0 +1,34 @@ + + +