diff options
| author | qmo-odoo <qmo@odoo.com> | 2019-05-13 11:09:31 +0000 |
|---|---|---|
| committer | Thibault Delavallée <tde@odoo.com> | 2019-08-08 08:29:34 +0000 |
| commit | b180c66a80ae3ae34716f8524a990c9e9d2c1aa7 (patch) | |
| tree | 3ec67ec0b6b5b7eef55482ce2e0c793496a00931 /addons/website_slides/data/slide_slide_demo.xml | |
| parent | 5f4c7c5afae3a58f1925c3645af0a005d4fa6e1c (diff) | |
[REF] website_slides: replace slide.category by slide with is_category flag
PURPOSE
Like already done for sale order, invoice of survey, purpose of this commit
is to remove category model and replace by a flagged line (slide). It allows
to easily reorder slides in an embedded list view.
SPECIFICATIONS
Instead of having a fully fledged slide.category model, slide.slide will serve
that purpose with a is_category flag. This will allow to drag and drop slides
and sections in the channel form view.
This change had an impact on the way slides were added/sorted on the front-end.
In fact, whenever a slide is added from the front-end, a resequencing of all
the slides in the course has to be triggered.
Category of a slide is now a computed field based on the sequence. Order
of slides is based on sequence, with categories splitting the slide list based
on is_category flag.
In this commit tests are added. Some cleaning in tests is also performed to
speedup a bit tests (savepointcase) and some cleaning / renaming to ease
their understanding.
Future commit will add JS necessary to manage slides in the section list view.
LINKS
TaskID: 1978731
PR: #33255
Diffstat (limited to 'addons/website_slides/data/slide_slide_demo.xml')
| -rw-r--r-- | addons/website_slides/data/slide_slide_demo.xml | 106 |
1 files changed, 84 insertions, 22 deletions
diff --git a/addons/website_slides/data/slide_slide_demo.xml b/addons/website_slides/data/slide_slide_demo.xml index e097b4de33b..b35f2defc5f 100644 --- a/addons/website_slides/data/slide_slide_demo.xml +++ b/addons/website_slides/data/slide_slide_demo.xml @@ -10,7 +10,6 @@ <field name="image_1920" type="base64" file="website_slides/static/src/img/channel-training-default.jpg"/> <field name="slide_type">presentation</field> <field name="channel_id" ref="website_slides.slide_channel_demo_0_gard_0"/> - <field name="category_id" eval="False"/> <field name="is_published" eval="True"/> <field name="is_preview" eval="True"/> <field name="public_views">10</field> @@ -24,7 +23,6 @@ <field name="image_1920" type="base64" file="website_slides/static/src/img/slide_demo_gardening_1.jpg"/> <field name="slide_type">infographic</field> <field name="channel_id" ref="website_slides.slide_channel_demo_0_gard_0"/> - <field name="category_id" eval="False"/> <field name="is_published" eval="True"/> <field name="is_preview" eval="False"/> <field name="public_views">5</field> @@ -35,13 +33,28 @@ <!-- CHANNEL 1: Taking care of Trees --> <!-- ================================================== --> + + <!-- Categories --> + <record id="slide_category_demo_1_0" model="slide.slide"> + <field name="name">Interesting Facts</field> + <field name="is_category" eval="True"/> + <field name="channel_id" ref="website_slides.slide_channel_demo_1_gard1"/> + <field name="sequence">0</field> + </record> + <record id="slide_category_demo_1_1" model="slide.slide"> + <field name="name">Methods</field> + <field name="is_category" eval="True"/> + <field name="channel_id" ref="website_slides.slide_channel_demo_1_gard1"/> + <field name="sequence">4</field> + </record> + + <!-- Slides --> <record id="slide_slide_demo_1_0" model="slide.slide"> <field name="name">Tree Infographic</field> <field name="sequence">1</field> <field name="image_1920" type="base64" file="website_slides/static/src/img/slide_demo_tree_infographic_1.jpg"/> <field name="slide_type">infographic</field> <field name="channel_id" ref="website_slides.slide_channel_demo_1_gard1"/> - <field name="category_id" ref="website_slides.slide_category_demo_1_0"/> <field name="is_published" eval="True"/> <field name="is_preview" eval="True"/> <field name="public_views">5</field> @@ -55,7 +68,6 @@ <field name="image_1920" type="base64" file="website_slides/static/src/img/slide_demo_tree_infographic_2.jpg"/> <field name="slide_type">infographic</field> <field name="channel_id" ref="website_slides.slide_channel_demo_1_gard1"/> - <field name="category_id" ref="website_slides.slide_category_demo_1_0"/> <field name="is_published" eval="True"/> <field name="is_preview" eval="False"/> <field name="public_views">5</field> @@ -69,7 +81,6 @@ <field name="image_1920" type="base64" file="website_slides/static/src/img/slide_demo_tree_infographic_3.jpg"/> <field name="slide_type">infographic</field> <field name="channel_id" ref="website_slides.slide_channel_demo_1_gard1"/> - <field name="category_id" ref="website_slides.slide_category_demo_1_0"/> <field name="is_published" eval="True"/> <field name="is_preview" eval="False"/> <field name="public_views">10</field> @@ -89,13 +100,12 @@ </record> <record id="slide_slide_demo_1_3" model="slide.slide"> <field name="name">How to plant a potted tree</field> - <field name="sequence">4</field> + <field name="sequence">5</field> <field name="url">https://www.youtube.com/watch?v=QYmgrw0PgLU</field> <field name="image_1920" type="base64" file="website_slides/static/src/img/slide_demo_thumb_QYmgrw0PgLU.jpg"/> <field name="document_id">QYmgrw0PgLU</field> <field name="slide_type">video</field> <field name="channel_id" ref="website_slides.slide_channel_demo_1_gard1"/> - <field name="category_id" ref="website_slides.slide_category_demo_1_1"/> <field name="is_published" eval="True"/> <field name="is_preview" eval="False"/> <field name="public_views">0</field> @@ -105,11 +115,10 @@ </record> <record id="slide_slide_demo_1_4" model="slide.slide"> <field name="name">A little chat with Harry Potted</field> - <field name="sequence">5</field> + <field name="sequence">6</field> <field name="image_1920" type="base64" file="website_slides/static/src/img/slide_demo_tree_img_1.jpg"/> <field name="slide_type">webpage</field> <field name="channel_id" ref="website_slides.slide_channel_demo_1_gard1"/> - <field name="category_id" ref="website_slides.slide_category_demo_1_1"/> <field name="html_content" type="html"> <section class="s_cover parallax bg-black-50 pt16 pb16" data-scroll-background-ratio="0" style="background-image: none;"> <span class="s_parallax_bg oe_img_bg oe_custom_bg" style="background-image: url('/website_slides/static/src/img/slide_demo_tree_img_1.jpg'); background-position: 50% 0;"></span> @@ -202,7 +211,6 @@ <field name="image_1920" type="base64" file="website_slides/static/src/img/channel-training-default.jpg"/> <field name="slide_type">presentation</field> <field name="channel_id" ref="website_slides.slide_channel_demo_1_gard1"/> - <field name="category_id" ref="website_slides.slide_category_demo_1_1"/> <field name="is_published" eval="True"/> <field name="is_preview" eval="False"/> <field name="public_views">10</field> @@ -213,6 +221,22 @@ <!-- CHANNEL 2: Trees, Wood and Garden --> <!-- ================================================== --> + + <!-- Categories --> + <record id="slide_category_demo_2_0" model="slide.slide"> + <field name="name">Trees</field> + <field name="is_category" eval="True"/> + <field name="channel_id" ref="website_slides.slide_channel_demo_2_gard2"/> + <field name="sequence">0</field> + </record> + <record id="slide_category_demo_2_1" model="slide.slide"> + <field name="name">Wood</field> + <field name="is_category" eval="True"/> + <field name="channel_id" ref="website_slides.slide_channel_demo_2_gard2"/> + <field name="sequence">4</field> + </record> + + <!-- Slides --> <record id="slide_slide_demo_2_0" model="slide.slide"> <field name="name">Main Trees Categories</field> <field name="sequence">1</field> @@ -220,7 +244,6 @@ <field name="image_1920" type="base64" file="website_slides/static/src/img/slide_demo_tree_img_2.jpg"/> <field name="slide_type">presentation</field> <field name="channel_id" ref="website_slides.slide_channel_demo_2_gard2"/> - <field name="category_id" ref="website_slides.slide_category_demo_2_0"/> <field name="is_published" eval="True"/> <field name="is_preview" eval="True"/> <field name="public_views">0</field> @@ -281,7 +304,6 @@ <field name="image_1920" type="base64" file="website_slides/static/src/img/slide_demo_tree_img_3.jpg"/> <field name="slide_type">webpage</field> <field name="channel_id" ref="website_slides.slide_channel_demo_2_gard2"/> - <field name="category_id" ref="website_slides.slide_category_demo_2_0"/> <field name="html_content" type="html"> <section class="s_cover parallax bg-black-50 pt16 pb16" data-scroll-background-ratio="0" style="background-image: none;"> <span class="s_parallax_bg oe_img_bg oe_custom_bg" style="background-image: url('/website_slides/static/src/img/slide_demo_tree_img_3.jpg'); background-position: 50% 0;"></span> @@ -326,12 +348,12 @@ </record> <record id="slide_slide_demo_2_2" model="slide.slide"> <field name="name">Tree planting in hanging bottles on wall</field> + <field name="sequence">3</field> <field name="url">https://www.youtube.com/watch?v=ebBez6bcSEc</field> <field name="image_1920" type="base64" file="website_slides/static/src/img/slide_demo_thumb_ebBez6bcSEc.jpg"/> <field name="document_id">ebBez6bcSEc</field> <field name="slide_type">video</field> <field name="channel_id" ref="website_slides.slide_channel_demo_2_gard2"/> - <field name="category_id" ref="website_slides.slide_category_demo_2_0"/> <field name="is_published" eval="True"/> <field name="is_preview" eval="False"/> <field name="public_views">0</field> @@ -340,8 +362,54 @@ <field name="description">How to wall decorating by tree planting in hanging plastic bottles.</field> </record> + <!-- CHANNEL 3: Choose your wood ! --> + <!-- ======================================= --> + + <!-- Categories --> + <record id="slide_category_demo_3_0" model="slide.slide"> + <field name="name">Introduction</field> + <field name="is_category" eval="True"/> + <field name="channel_id" ref="website_slides.slide_channel_demo_3_furn0"/> + <field name="sequence">0</field> + </record> + + <!-- CHANNEL 4: Furniture Technical Specifications --> + <!-- ======================================= --> + + <!-- Categories --> + <record id="slide_category_demo_4_0" model="slide.slide"> + <field name="name">Introduction</field> + <field name="is_category" eval="True"/> + <field name="channel_id" ref="website_slides.slide_channel_demo_4_furn1"/> + <field name="sequence">0</field> + </record> + <!-- CHANNEL 5: Basics of Furniture Creation --> <!-- ======================================= --> + + <!-- Categories --> + <record id="slide_category_demo_5_0" model="slide.slide"> + <field name="name">Tools and Methods</field> + <field name="is_category" eval="True"/> + <field name="channel_id" ref="website_slides.slide_channel_demo_5_furn2"/> + <field name="sequence">0</field> + </record> + + <record id="slide_category_demo_5_1" model="slide.slide"> + <field name="name">Hand on !</field> + <field name="is_category" eval="True"/> + <field name="channel_id" ref="website_slides.slide_channel_demo_5_furn2"/> + <field name="sequence">3</field> + </record> + + <record id="slide_category_demo_5_2" model="slide.slide"> + <field name="name">Test Yourself</field> + <field name="is_category" eval="True"/> + <field name="channel_id" ref="website_slides.slide_channel_demo_5_furn2"/> + <field name="sequence">5</field> + </record> + + <!-- Slides --> <record id="slide_slide_demo_5_0" model="slide.slide"> <field name="name">Unforgettable Tools</field> <field name="sequence">1</field> @@ -349,7 +417,6 @@ <field name="image_1920" type="base64" file="website_slides/static/src/img/channel-training-default.jpg"/> <field name="slide_type">presentation</field> <field name="channel_id" ref="website_slides.slide_channel_demo_5_furn2"/> - <field name="category_id" ref="website_slides.slide_category_demo_5_0"/> <field name="is_published" eval="True"/> <field name="is_preview" eval="True"/> <field name="public_views">10</field> @@ -375,8 +442,6 @@ <field name="document_id">5WMqwTnZ-qs</field> <field name="slide_type">video</field> <field name="channel_id" ref="website_slides.slide_channel_demo_5_furn2"/> - <field name="category_id" ref="website_slides.slide_category_demo_5_1"/> - <field name="category_id" eval="False"/> <field name="is_published" eval="True"/> <field name="is_preview" eval="False"/> <field name="public_views">0</field> @@ -385,14 +450,12 @@ </record> <record id="slide_slide_demo_5_2" model="slide.slide"> <field name="name">How to create your own piece of furniture</field> - <field name="sequence">3</field> + <field name="sequence">4</field> <field name="image_1920" type="base64" file="website_slides/static/src/img/slide_demo_thumb_ptjeDDoURL8.jpg"/> <field name="url">https://www.youtube.com/watch?v=ptjeDDoURL8</field> <field name="document_id">ptjeDDoURL8</field> <field name="slide_type">video</field> <field name="channel_id" ref="website_slides.slide_channel_demo_5_furn2"/> - <field name="category_id" ref="website_slides.slide_category_demo_5_1"/> - <field name="category_id" eval="False"/> <field name="is_published" eval="True"/> <field name="is_preview" eval="True"/> <field name="public_views">5</field> @@ -401,11 +464,10 @@ </record> <record id="slide_slide_demo_5_3" model="slide.slide"> <field name="name">Test your knowledge !</field> - <field name="sequence">4</field> + <field name="sequence">6</field> <field name="image_1920" type="base64" file="website_slides/static/src/img/slide_demo_owl.jpg"/> <field name="slide_type">quiz</field> <field name="channel_id" ref="website_slides.slide_channel_demo_5_furn2"/> - <field name="category_id" ref="website_slides.slide_category_demo_5_0"/> <field name="is_published" eval="True"/> <field name="is_preview" eval="False"/> <field name="public_views">0</field> @@ -430,4 +492,4 @@ <!-- CHANNEL 6: DIY Furniture --> <!-- ======================================= --> -</data></odoo> +</data></odoo>
\ No newline at end of file |
