Reach the next rank to show the rest of the world you exist!
- 
+ 
Reach the next rank to improve your status.
- 
+ 
Reach the next rank and become a Master!
- 
+ 
Reach the next rank and become a powerful user!
- 
+ 
', {class: 'o_value'}).html(formatter(value, measure)));
diff --git a/addons/web/static/src/js/widgets/pie_chart.js b/addons/web/static/src/js/widgets/pie_chart.js
index ddeca1fdcec..a9b0bc01e45 100644
--- a/addons/web/static/src/js/widgets/pie_chart.js
+++ b/addons/web/static/src/js/widgets/pie_chart.js
@@ -34,6 +34,11 @@ var PieChart = Widget.extend({
title: node.attrs.title || modifiers.title || modifiers.measure,
});
+ var pieChartContext = JSON.parse(JSON.stringify(record.context));
+ delete pieChartContext.graph_mode;
+ delete pieChartContext.graph_measure;
+ delete pieChartContext.graph_groupbys;
+
this.subViewParams = {
modelName: record.model,
withControlPanel: false,
@@ -41,7 +46,7 @@ var PieChart = Widget.extend({
mode: 'pie',
};
this.subViewParams.searchQuery = {
- context: record.context,
+ context: pieChartContext,
domain: domain,
groupBy: [],
};
diff --git a/addons/web/static/src/scss/pivot_view.scss b/addons/web/static/src/scss/pivot_view.scss
index 83f8fbc58e7..6bc25ee114e 100644
--- a/addons/web/static/src/scss/pivot_view.scss
+++ b/addons/web/static/src/scss/pivot_view.scss
@@ -87,4 +87,9 @@
right: 6px;
top: 9px;
}
+
+ .o_pivot_field_menu .dropdown-item.disabled {
+ color: $text-muted;
+ cursor: default;
+ }
}
diff --git a/addons/web/static/src/xml/base.xml b/addons/web/static/src/xml/base.xml
index 564bbc8582e..c925809fab5 100644
--- a/addons/web/static/src/xml/base.xml
+++ b/addons/web/static/src/xml/base.xml
@@ -532,7 +532,7 @@
-
+
diff --git a/addons/web/static/tests/views/control_panel_tests.js b/addons/web/static/tests/views/control_panel_tests.js
index 2e0a369ab4a..7d033e5f1e4 100644
--- a/addons/web/static/tests/views/control_panel_tests.js
+++ b/addons/web/static/tests/views/control_panel_tests.js
@@ -418,6 +418,47 @@ QUnit.module('Views', {
controlPanel.destroy();
});
+ QUnit.test('Favorites Use by Default and Share are exclusive', async function (assert) {
+ assert.expect(11);
+ var controlPanel = await createControlPanel({
+ model: 'partner',
+ arch: "''', type='http', auth="public", website=True)
def slide_view(self, slide, **kwargs):
- if not slide.channel_id.can_access_from_current_website():
+ if not slide.channel_id.can_access_from_current_website() or not slide.active:
raise werkzeug.exceptions.NotFound()
self._set_viewed_slide(slide)
@@ -517,6 +528,15 @@ class WebsiteSlides(WebsiteProfile):
# sidebar: update with user channel progress
values['channel_progress'] = self._get_channel_progress(slide.channel_id, include_quiz=True)
+ # Allows to have breadcrumb for the previously used filter
+ values.update({
+ 'search_category': slide.category_id.id if kwargs.get('search_category') else None,
+ 'search_tag': request.env['slide.tag'].browse(int(kwargs.get('search_tag'))) if kwargs.get('search_tag') else None,
+ 'slide_types': dict(request.env['slide.slide']._fields['slide_type']._description_selection(request.env)) if kwargs.get('search_slide_type') else None,
+ 'search_slide_type': kwargs.get('search_slide_type'),
+ 'search_uncategorized': kwargs.get('search_uncategorized')
+ })
+
if kwargs.get('fullscreen') == '1':
return request.render("website_slides.slide_fullscreen", values)
return request.render("website_slides.slide_main", values)
diff --git a/addons/website_slides/models/slide_slide.py b/addons/website_slides/models/slide_slide.py
index b0567dcc627..851ec30fd4d 100644
--- a/addons/website_slides/models/slide_slide.py
+++ b/addons/website_slides/models/slide_slide.py
@@ -135,7 +135,7 @@ class Slide(models.Model):
('video', 'Video'),
('quiz', "Quiz")],
string='Type', required=True,
- default='document', readonly=True,
+ default='document',
help="The document type will be set automatically based on the document URL and properties (e.g. height and width for presentation and document).")
index_content = fields.Text('Transcript')
datas = fields.Binary('Content', attachment=True)
@@ -553,11 +553,16 @@ class Slide(models.Model):
return result
def _find_document_data_from_url(self, url):
- expr = re.compile(r'^.*((youtu.be/)|(v/)|(\/u\/\w\/)|(embed\/)|(watch\?))\??v?=?([^#\&\?]*).*')
- arg = expr.match(url)
- document_id = arg and arg.group(7) or False
- if document_id:
- return ('youtube', document_id)
+ url_obj = urls.url_parse(url)
+ if url_obj.ascii_host == 'youtu.be':
+ return ('youtube', url_obj.path[1:] if url_obj.path else False)
+ elif url_obj.ascii_host in ('youtube.com', 'www.youtube.com', 'm.youtube.com'):
+ v_query_value = url_obj.decode_query().get('v')
+ if v_query_value:
+ return ('youtube', v_query_value)
+ split_path = url_obj.path.split('/')
+ if len(split_path) >= 3 and split_path[1] in ('v', 'embed'):
+ return ('youtube', split_path[2])
expr = re.compile(r'(^https:\/\/docs.google.com|^https:\/\/drive.google.com).*\/d\/([^\/]*)')
arg = expr.match(url)
diff --git a/addons/website_slides/static/src/js/slides_course_fullscreen_player.js b/addons/website_slides/static/src/js/slides_course_fullscreen_player.js
index 6fa054b6647..8a648a3cb3b 100644
--- a/addons/website_slides/static/src/js/slides_course_fullscreen_player.js
+++ b/addons/website_slides/static/src/js/slides_course_fullscreen_player.js
@@ -5,6 +5,7 @@ odoo.define('website_slides.fullscreen', function (require) {
var publicWidget = require('web.public.widget');
var core = require('web.core');
+ var config = require('web.config');
var QWeb = core.qweb;
var session = require('web.session');
@@ -321,6 +322,9 @@ odoo.define('website_slides.fullscreen', function (require) {
start: function (){
var self = this;
this.on('change:slide', this, this._onChangeSlide);
+ if (config.device.size_class > config.device.SIZES.MD) {
+ this._toggleSidebar();
+ }
return this._super.apply(this, arguments).then(function () {
self._onChangeSlide(); // trigger manually once DOM ready, since slide content is not rendered server side
});
@@ -540,12 +544,20 @@ odoo.define('website_slides.fullscreen', function (require) {
this.sidebar.goNext();
},
/**
- * Show or Hide the sidebar
+ * Called when the sidebar toggle is clicked -> toggles the sidebar visibility.
*
* @private
*/
_onClickToggleSidebar: function (ev){
ev.preventDefault();
+ this._toggleSidebar();
+ },
+ /**
+ * Toggles sidebar visibility.
+ *
+ * @private
+ */
+ _toggleSidebar: function () {
this.$('.o_wslides_fs_sidebar').toggleClass('o_wslides_fs_sidebar_hidden');
this.$('.o_wslides_fs_toggle_sidebar').toggleClass('active');
},
diff --git a/addons/website_slides/static/src/js/slides_share.js b/addons/website_slides/static/src/js/slides_share.js
index 3f921a2229a..d89cdfcb4bf 100644
--- a/addons/website_slides/static/src/js/slides_share.js
+++ b/addons/website_slides/static/src/js/slides_share.js
@@ -49,48 +49,12 @@ publicWidget.registry.websiteSlidesShare = publicWidget.Widget.extend({
* @param {Object} parent
*/
start: function (parent) {
- var self = this;
var defs = [this._super.apply(this, arguments)];
defs.push(new ShareMail(this).attachTo($('.oe_slide_js_share_email')));
- if ($('div#statistic').length) {
- this.slideURL = $('div#statistic').attr('slide-url');
- this.socialURLs = {
- linkedin: 'https://www.linkedin.com/countserv/count/share?url=',
- twitter: 'https://cdn.api.twitter.com/1/urls/count.json?url=',
- facebook: 'https://graph.facebook.com/?id=',
- };
- }
-
- _.each(this.socialURLs, function (value, key) {
- self._updateStatistics(key, self.slideURL);
- });
-
return Promise.all(defs);
},
- //--------------------------------------------------------------------------
- // Private
- //--------------------------------------------------------------------------
-
- /**
- * @private
- * @param {string} socialSite
- * @param {string} slide_url
- */
- _updateStatistics: function (socialSite, slideURL) {
- var self = this;
- $.ajax({
- url: self.socialURLs[socialSite] + slideURL,
- dataType: 'jsonp',
- success: function (data) {
- var shareCount = (socialSite === 'facebook' ? data.shares : data.count) || 0;
- $('#' + socialSite + '-badge').text(shareCount);
- $('#total-share').text(parseInt($('#total-share').text()) + parseInt($('#' + socialSite + '-badge').text()));
- },
- });
- },
-
//--------------------------------------------------------------------------
// Handlers
//--------------------------------------------------------------------------
@@ -100,14 +64,11 @@ publicWidget.registry.websiteSlidesShare = publicWidget.Widget.extend({
* @param {Object} ev
*/
_onSlidesSocialShare: function (ev) {
- var self = this;
ev.preventDefault();
- var key = $(ev.currentTarget).attr('social-key');
var popUpURL = $(ev.currentTarget).attr('href');
var popUp = window.open(popUpURL, 'Share Dialog', 'width=626,height=436');
$(window).on('focus', function () {
if (popUp.closed) {
- self._updateStatistics(key, self.slide_url);
$(window).off('focus');
}
});
diff --git a/addons/website_slides/tests/__init__.py b/addons/website_slides/tests/__init__.py
index 69bfc7de9e2..466b2b82674 100644
--- a/addons/website_slides/tests/__init__.py
+++ b/addons/website_slides/tests/__init__.py
@@ -5,3 +5,5 @@ from . import common
from . import test_security
from . import test_statistics
from . import test_karma
+
+from . import test_from_url
\ No newline at end of file
diff --git a/addons/website_slides/tests/test_from_url.py b/addons/website_slides/tests/test_from_url.py
new file mode 100644
index 00000000000..dc9a1d6768e
--- /dev/null
+++ b/addons/website_slides/tests/test_from_url.py
@@ -0,0 +1,30 @@
+import odoo.tests
+
+
+class TestFromURL(odoo.tests.TransactionCase):
+ def test_youtube_urls(self):
+ urls = {
+ 'W0JQcpGLSFw': [
+ 'https://youtu.be/W0JQcpGLSFw',
+ 'https://www.youtube.com/watch?v=W0JQcpGLSFw',
+ 'https://www.youtube.com/watch?v=W0JQcpGLSFw&list=PL1-aSABtP6ACZuppkBqXFgzpNb2nVctZx',
+ ],
+ 'vmhB-pt7EfA': [ # id starts with v, it is important
+ 'https://youtu.be/vmhB-pt7EfA',
+ 'https://www.youtube.com/watch?feature=youtu.be&v=vmhB-pt7EfA',
+ 'https://www.youtube.com/watch?v=vmhB-pt7EfA&list=PL1-aSABtP6ACZuppkBqXFgzpNb2nVctZx&index=7',
+ ],
+ 'hlhLv0GN1hA': [
+ 'https://www.youtube.com/v/hlhLv0GN1hA',
+ 'https://www.youtube.com/embed/hlhLv0GN1hA',
+ 'https://m.youtube.com/watch?v=hlhLv0GN1hA'
+ ],
+ }
+
+ model = self.env['slide.slide']
+ for id, urls in urls.items():
+ for url in urls:
+ with self.subTest(url=url, id=id):
+ document = model._find_document_data_from_url(url)
+ self.assertEqual(document[0], 'youtube')
+ self.assertEqual(document[1], id)
diff --git a/addons/website_slides/views/slide_slide_views.xml b/addons/website_slides/views/slide_slide_views.xml
index b2dd1585ff0..1a2e45d5119 100644
--- a/addons/website_slides/views/slide_slide_views.xml
+++ b/addons/website_slides/views/slide_slide_views.xml
@@ -71,13 +71,13 @@
-
@@ -93,6 +93,7 @@
-