[FIX] website_slides: fix slide reordering in frontend
This commit fixes the reordering of slides on upload or drag and drop
in frontend. This issue was due to the fact that in a previous commit
(c4eba6f) uncategorized slides were moved to the bottom of the list,
which broke the reordering after drag and drop.
Indeed we use the dom order itself to reorder the slides with a simple rpc
call to dataset/resequence. Instead we revert part of the previous fix
to display uncategorized slides at the top. It allows to be coherent with
resequence and with backend behavior that displays uncategorized at the
top of the list.
Another issue was that, on slide upload, in the controller, we used
the category_id on the slide (which seems to not always be correct at
this stage) instead of the one given by the javascript. This caused the slide
to not be uploaded in the right section.
This commit also adds some margin to the categories in frontend for training
courses. Otherwise uncategorized slides are too close to the first category.
Task ID 2090927
X-original-commit: 7bd042d6e20c44558b90641409a6e3f8fa8000ed
This commit is contained in:
qmo-odoo
committed by
Thibault Delavallée
Thibault Delavallée
parent
843caa270c
commit
12c6d77e7f
@@ -1024,19 +1024,18 @@ class WebsiteSlides(WebsiteProfile):
|
||||
# minutes to hours conversion
|
||||
values['completion_time'] = int(post['duration']) / 60
|
||||
|
||||
category_id = False
|
||||
# handle creation of new categories on the fly
|
||||
if post.get('category_id'):
|
||||
if post['category_id'][0] == 0:
|
||||
category_id = post['category_id'][0]
|
||||
if category_id == 0:
|
||||
category = request.env['slide.slide'].create(self._get_new_slide_category_values(channel, post['category_id'][1]['name']))
|
||||
values['category_id'] = category.id
|
||||
values['sequence'] = category.sequence + 1
|
||||
category_id = category.id
|
||||
else:
|
||||
values.update({
|
||||
'category_id': post['category_id'][0],
|
||||
'sequence': request.env['slide.slide'].browse(post['category_id'][0]).sequence + 1
|
||||
})
|
||||
else:
|
||||
values['sequence'] = -1
|
||||
|
||||
# create slide itself
|
||||
try:
|
||||
@@ -1051,7 +1050,7 @@ class WebsiteSlides(WebsiteProfile):
|
||||
return {'error': _('Internal server error, please try again later or contact administrator.\nHere is the error message: %s') % e}
|
||||
|
||||
# ensure correct ordering by re sequencing slides in front-end (backend should be ok thanks to list view)
|
||||
channel._resequence_slides(slide)
|
||||
channel._resequence_slides(slide, category_id)
|
||||
|
||||
redirect_url = "/slides/slide/%s" % (slide.id)
|
||||
if channel.channel_type == "training" and not slide.slide_type == "webpage":
|
||||
|
||||
@@ -593,13 +593,26 @@ class Channel(models.Model):
|
||||
|
||||
def _get_categorized_slides(self, base_domain, order, force_void=True, limit=False, offset=False):
|
||||
""" Return an ordered structure of slides by categories within a given
|
||||
base_domain that must fulfill slides. """
|
||||
base_domain that must fulfill slides. As a course structure is based on
|
||||
its slides sequences, uncategorized slides must have the lowest sequences.
|
||||
|
||||
Example
|
||||
* category 1 (sequence 1), category 2 (sequence 3)
|
||||
* slide 1 (sequence 0), slide 2 (sequence 2)
|
||||
* course structure is: slide 1, category 1, slide 2, category 2
|
||||
* slide 1 is uncategorized,
|
||||
* category 1 has one slide : Slide 2
|
||||
* category 2 is empty.
|
||||
|
||||
Backend and frontend ordering is the same, uncategorized first. It
|
||||
eases resequencing based on DOM / displayed order, notably when
|
||||
drag n drop is involved. """
|
||||
self.ensure_one()
|
||||
all_categories = self.env['slide.slide'].sudo().search([('channel_id', '=', self.id), ('is_category', '=', True)])
|
||||
all_slides = self.env['slide.slide'].sudo().search(base_domain, order=order)
|
||||
category_data = []
|
||||
|
||||
# First add all categories by natural order
|
||||
# Prepare all categories by natural order
|
||||
for category in all_categories:
|
||||
category_slides = all_slides.filtered(lambda slide: slide.category_id == category)
|
||||
if not category_slides and not force_void:
|
||||
@@ -610,15 +623,17 @@ class Channel(models.Model):
|
||||
'total_slides': len(category_slides),
|
||||
'slides': category_slides[(offset or 0):(limit + offset or len(category_slides))],
|
||||
})
|
||||
# Then add uncategorized slides
|
||||
|
||||
# Add uncategorized slides in first position
|
||||
uncategorized_slides = all_slides.filtered(lambda slide: not slide.category_id)
|
||||
if uncategorized_slides or force_void:
|
||||
category_data.append({
|
||||
category_data.insert(0, {
|
||||
'category': False, 'id': False,
|
||||
'name': _('Uncategorized'), 'slug_name': _('Uncategorized'),
|
||||
'total_slides': len(uncategorized_slides),
|
||||
'slides': uncategorized_slides[(offset or 0):(offset + limit or len(uncategorized_slides))],
|
||||
})
|
||||
|
||||
return category_data
|
||||
|
||||
def _resequence_slides(self, slide, force_category=False):
|
||||
|
||||
@@ -5,6 +5,25 @@ from odoo.addons.website_slides.tests import common as slides_common
|
||||
from odoo.tests.common import users
|
||||
|
||||
|
||||
class TestSlidesManagement(slides_common.SlidesCase):
|
||||
|
||||
@users('user_officer')
|
||||
def test_get_categorized_slides(self):
|
||||
new_category = self.env['slide.slide'].create({
|
||||
'name': 'Cooking Tips for Cooking Humans',
|
||||
'channel_id': self.channel.id,
|
||||
'is_category': True,
|
||||
'sequence': 5,
|
||||
})
|
||||
order = self.env['slide.slide']._order_by_strategy['sequence']
|
||||
categorized_slides = self.channel._get_categorized_slides([], order)
|
||||
self.assertEqual(categorized_slides[0]['category'], False)
|
||||
self.assertEqual(categorized_slides[1]['category'], self.category)
|
||||
self.assertEqual(categorized_slides[1]['total_slides'], 2)
|
||||
self.assertEqual(categorized_slides[2]['total_slides'], 0)
|
||||
self.assertEqual(categorized_slides[2]['category'], new_category)
|
||||
|
||||
|
||||
class TestSequencing(slides_common.SlidesCase):
|
||||
|
||||
@users('user_officer')
|
||||
|
||||
@@ -366,7 +366,7 @@
|
||||
|
||||
<li t-if="category['total_slides'] or channel.can_publish" t-att-class="'o_wslides_slide_list_category o_wslides_js_list_item mb-2' if category_id else 'mt-4'" t-att-data-slide-id="category_id" t-att-data-category-id="category_id">
|
||||
<div t-att-data-category-id="category_id"
|
||||
t-att-class="'o_wslides_slide_list_category_header position-relative d-flex justify-content-between align-items-center %s' % ('o_wslides_js_category bg-white shadow-sm border-bottom-0' if category_id and channel.can_upload else 'border-0 py-1')">
|
||||
t-att-class="'o_wslides_slide_list_category_header position-relative d-flex justify-content-between align-items-center mt8 %s' % ('o_wslides_js_category bg-white shadow-sm border-bottom-0' if category_id and channel.can_upload else 'border-0 py-1')">
|
||||
<div t-att-class="'d-flex align-items-center pl-3 %s' % ('o_wslides_slides_list_drag' if channel.can_publish else '')">
|
||||
<div t-if="channel.can_publish and category_id" class="o_wslides_slides_list_drag py-2 pr-3">
|
||||
<i class="fa fa-bars"/>
|
||||
|
||||
Reference in New Issue
Block a user