diff --git a/addons/website_slides/__manifest__.py b/addons/website_slides/__manifest__.py index a0a58046f3f..f7b64a54797 100644 --- a/addons/website_slides/__manifest__.py +++ b/addons/website_slides/__manifest__.py @@ -33,6 +33,7 @@ Featuring 'views/rating_rating_views.xml', 'views/slide_embed_views.xml', 'views/slide_question_views.xml', + 'views/slide_slide_partner_views.xml', 'views/slide_slide_views.xml', 'views/slide_channel_partner_views.xml', 'views/slide_channel_views.xml', diff --git a/addons/website_slides/models/slide_slide.py b/addons/website_slides/models/slide_slide.py index 7386cfc597b..1a722cb2714 100644 --- a/addons/website_slides/models/slide_slide.py +++ b/addons/website_slides/models/slide_slide.py @@ -26,8 +26,10 @@ class SlidePartnerRelation(models.Model): _name = 'slide.slide.partner' _description = 'Slide / Partner decorated m2m' _table = 'slide_slide_partner' + _rec_name = 'partner_id' - slide_id = fields.Many2one('slide.slide', ondelete="cascade", index=True, required=True) + slide_id = fields.Many2one('slide.slide', string="Content", ondelete="cascade", index=True, required=True) + slide_category = fields.Selection(related='slide_id.slide_category') channel_id = fields.Many2one( 'slide.channel', string="Channel", related="slide_id.channel_id", store=True, index=True, ondelete='cascade') diff --git a/addons/website_slides/views/slide_slide_partner_views.xml b/addons/website_slides/views/slide_slide_partner_views.xml new file mode 100644 index 00000000000..eb3e9927ace --- /dev/null +++ b/addons/website_slides/views/slide_slide_partner_views.xml @@ -0,0 +1,79 @@ + + + + slide.slide.partner.view.search + slide.slide.partner + + + + + + + + + + + + + + + + slide.slide.partner.view.tree + slide.slide.partner + + + + + + + + + + + + + + + slide.slide.partner.view.form + slide.slide.partner + +
+ + + + + + + + + + + + + + + +
+
+
+ + + Attendees + slide.slide.partner + tree,form,kanban + + {'default_slide_id': active_id} + [('slide_id', '=', active_id)] + +

+ No Attendee Yet! +

+

+ From here you'll be able to monitor attendees and to track their progress. +

+
+
+ +
diff --git a/addons/website_slides/views/slide_slide_views.xml b/addons/website_slides/views/slide_slide_views.xml index 3f8affcb44d..1018ce0a381 100644 --- a/addons/website_slides/views/slide_slide_views.xml +++ b/addons/website_slides/views/slide_slide_views.xml @@ -51,22 +51,11 @@
- - -
- + + + diff --git a/addons/website_slides_survey/__manifest__.py b/addons/website_slides_survey/__manifest__.py index 346961eb7de..7d2f6734d48 100644 --- a/addons/website_slides_survey/__manifest__.py +++ b/addons/website_slides_survey/__manifest__.py @@ -12,6 +12,7 @@ 'data': [ 'security/ir.model.access.csv', 'views/slide_channel_views.xml', + 'views/slide_slide_partner_views.xml', 'views/slide_slide_views.xml', 'views/survey_survey_views.xml', 'views/website_slides_menu_views.xml', diff --git a/addons/website_slides_survey/views/slide_slide_partner_views.xml b/addons/website_slides_survey/views/slide_slide_partner_views.xml new file mode 100644 index 00000000000..33cd07c32ba --- /dev/null +++ b/addons/website_slides_survey/views/slide_slide_partner_views.xml @@ -0,0 +1,42 @@ + + + + + slide.slide.partner.view.search.inherit.survey + slide.slide.partner + + + + + + + + + + slide.slide.partner.view.tree.inherit.survey + slide.slide.partner + + + + + + + + + + slide.slide.partner.view.form.inherit.survey + slide.slide.partner + + + + + + + + + + + +