summaryrefslogtreecommitdiff
path: root/addons/website_slides
diff options
context:
space:
mode:
authorDavid Beguin <dbe@odoo.com>2019-02-14 10:45:26 +0000
committerDavid Beguin <dbe@odoo.com>2019-02-18 15:15:02 +0000
commit3ab9f1d8abeec6fcbe2fd0aedcf3712c3e3f583b (patch)
tree4bf4d50910b9e0e339861a5eaa0bf48e8097d712 /addons/website_slides
parent705376a982d64fb41800f148a167ef0fc28ce4c6 (diff)
[IMP] website_slides_forum : set communication on slide.channel at creation - frontend side
Since 556b6454dab07cdf716d404ec0db9aa51a09b165, channel can be linked to a dedicated forum. But the link could only be done in backend, in the slide.channel configuration For now on, website_publishers can create a new dedicated forum when they create a new slide.channel. Link buttons have been added in both forum and slide.channel headers to navigate easily between them. Fix the relation between course and forum in a model point of view. Task ID : 1922159 PR #31109
Diffstat (limited to 'addons/website_slides')
-rw-r--r--addons/website_slides/controllers/main.py3
-rw-r--r--addons/website_slides/static/src/xml/website_slides_channel.xml2
-rw-r--r--addons/website_slides/views/slide_channel_views.xml6
3 files changed, 9 insertions, 2 deletions
diff --git a/addons/website_slides/controllers/main.py b/addons/website_slides/controllers/main.py
index ef4265055f6..e8ebae00b7b 100644
--- a/addons/website_slides/controllers/main.py
+++ b/addons/website_slides/controllers/main.py
@@ -96,6 +96,9 @@ class WebsiteSlides(WebsiteProfile):
domain = expression.AND([domain, [('nbr_%ss' % slide_type, '>', 0)]])
return domain
+ def _prepare_channel_values(self, **kwargs):
+ return dict(**kwargs)
+
# --------------------------------------------------
# MAIN / SEARCH
# --------------------------------------------------
diff --git a/addons/website_slides/static/src/xml/website_slides_channel.xml b/addons/website_slides/static/src/xml/website_slides_channel.xml
index 5334a01ad53..0147f56eac5 100644
--- a/addons/website_slides/static/src/xml/website_slides_channel.xml
+++ b/addons/website_slides/static/src/xml/website_slides_channel.xml
@@ -37,7 +37,7 @@
<textarea name="description" id="description" style="height:8em" class="form-control" placeholder="Write here a short description of your first course"/>
</div>
</div>
- <div class="form-group row">
+ <div class="form-group row o_wslide_channel_communication_type">
<div class="col-sm-2">Review</div>
<div class="col-sm-10">
<div class="form-check">
diff --git a/addons/website_slides/views/slide_channel_views.xml b/addons/website_slides/views/slide_channel_views.xml
index 7602d9c188a..91607fbace5 100644
--- a/addons/website_slides/views/slide_channel_views.xml
+++ b/addons/website_slides/views/slide_channel_views.xml
@@ -90,7 +90,6 @@
<group>
<group>
<field name="channel_type" widget="radio"/>
- <field name="allow_comment"/>
<field name="website_id" options="{'no_create': True}" groups="website.group_multi_website"/>
<field name="promote_strategy" widget="radio"/>
</group>
@@ -105,6 +104,11 @@
<field name="enroll_msg" colspan="4" nolabel="1"/>
</group>
</page>
+ <page string="Communication">
+ <group>
+ <field name="allow_comment"/>
+ </group>
+ </page>
<page string="Statistics" groups="base.group_no_one">
<group>
<group>