summaryrefslogtreecommitdiff
path: root/addons/website/static/src
diff options
context:
space:
mode:
authorJeremy Kersten <jke@odoo.com>2018-07-24 17:01:44 +0200
committerJeremy Kersten <jke@odoo.com>2018-08-13 20:16:34 +0200
commit602807acdf20ff4f75a1abb7f5fa1be4db3f532d (patch)
tree94b96796b1ef42c41be2e320e6bce973787dc9ed /addons/website/static/src
parenta45bb90fac04e454e9792dfea82772227e963e17 (diff)
[FIX] website: improve/fix menu, copy on unlink, clone page, unique_path, sale_report, ...
Fix bug from the initial poc of JOV Fix menu creation - creating a menu would create a 'container' menu in the DB (.create is call without website_id) then writing on it would copy (if condition to cow) the menu with a website_id leaving the first one as a menu container unused. - website_menu should always have a website_id we dont want to support the multiwebsite system that allow to have generic/specific menu unlink/write is useless now since we always have a website_id Make unique_path website dependent, 2 distinct website can have a page with same name Make Sale report multiwebsite compliant Make website_id on sale_order / account.invoice as a related stored from partner_id. Co-authored-by: Derie Romain <rde@odoo.com> Co-authored-by: Kersten Jérémy <jke@odoo.com>
Diffstat (limited to 'addons/website/static/src')
-rw-r--r--addons/website/static/src/js/content/menu.js2
-rw-r--r--addons/website/static/src/js/content/website_root.js2
-rw-r--r--addons/website/static/src/js/menu/content.js2
-rw-r--r--addons/website/static/src/js/widgets/theme.js3
-rw-r--r--addons/website/static/src/scss/website.ui.scss2
-rw-r--r--addons/website/static/src/xml/website.backend.xml4
-rw-r--r--addons/website/static/src/xml/website.pageProperties.xml16
7 files changed, 15 insertions, 16 deletions
diff --git a/addons/website/static/src/js/content/menu.js b/addons/website/static/src/js/content/menu.js
index 6effb471ec9..3511f51a70f 100644
--- a/addons/website/static/src/js/content/menu.js
+++ b/addons/website/static/src/js/content/menu.js
@@ -67,7 +67,7 @@ sAnimation.registry.affixMenu = sAnimation.Class.extend({
// Reset opened menus
this.$dropdowns.removeClass('show');
- this.$navbarCollapses.removeClass('in').attr('aria-expanded', false);
+ this.$navbarCollapses.removeClass('show').attr('aria-expanded', false);
},
});
diff --git a/addons/website/static/src/js/content/website_root.js b/addons/website/static/src/js/content/website_root.js
index 0f3fff53dfc..a51c8011e92 100644
--- a/addons/website/static/src/js/content/website_root.js
+++ b/addons/website/static/src/js/content/website_root.js
@@ -287,7 +287,7 @@ var WebsiteRoot = BodyManager.extend({
* @param {OdooEvent} ev
*/
_multiWebsiteSwitch: function (ev) {
- var website_id_to_switch_to = ev.target.getAttribute('website-id');
+ var website_id_to_switch_to = ev.currentTarget.getAttribute('website-id');
this._rpc({
route: '/website/force_website',
params: {
diff --git a/addons/website/static/src/js/menu/content.js b/addons/website/static/src/js/menu/content.js
index bcb46553b65..91494a4018b 100644
--- a/addons/website/static/src/js/menu/content.js
+++ b/addons/website/static/src/js/menu/content.js
@@ -542,7 +542,7 @@ var EditMenuDialog = weWidgets.Dialog.extend({
this._rpc({
model: 'website.menu',
method: 'save',
- args: [[context.website_id], { data: data, to_delete: self.to_delete }],
+ args: [context.website_id, { data: data, to_delete: self.to_delete }],
context: context,
}).then(function () {
return _super();
diff --git a/addons/website/static/src/js/widgets/theme.js b/addons/website/static/src/js/widgets/theme.js
index 50434604677..ce73fd35d3d 100644
--- a/addons/website/static/src/js/widgets/theme.js
+++ b/addons/website/static/src/js/widgets/theme.js
@@ -55,7 +55,6 @@ var ThemeCustomizeDialog = Dialog.extend({
*/
start: function () {
var self = this;
-
this._generateDialogHTML();
this.$modal.addClass('o_theme_customize_modal');
@@ -77,7 +76,7 @@ var ThemeCustomizeDialog = Dialog.extend({
this._loadViews()
);
},
-
+
//--------------------------------------------------------------------------
// Private
//--------------------------------------------------------------------------
diff --git a/addons/website/static/src/scss/website.ui.scss b/addons/website/static/src/scss/website.ui.scss
index a7be7e98290..f146b3de677 100644
--- a/addons/website/static/src/scss/website.ui.scss
+++ b/addons/website/static/src/scss/website.ui.scss
@@ -38,7 +38,7 @@ body.o_connected_user {
}
}
.o_menu_systray {
- a {
+ > li > a {
padding: 0 $grid-gutter-width/2;
&.css_edit_dynamic{
diff --git a/addons/website/static/src/xml/website.backend.xml b/addons/website/static/src/xml/website.backend.xml
index 6bdb10f24c6..5508d4be9d9 100644
--- a/addons/website/static/src/xml/website.backend.xml
+++ b/addons/website/static/src/xml/website.backend.xml
@@ -70,9 +70,9 @@
<button class="btn btn-secondary js_date_range" data-date="month">Last Month</button>
<button class="btn btn-secondary js_date_range" data-date="year">Last Year</button>
</div>
- <div class="btn-group btn-group-sm pull-right" style="margin-right: 20px;">
+ <div class="btn-group pull-right" style="margin-right: 20px;">
<t t-foreach="widget.websites" t-as="website">
- <button t-attf-class="btn btn-sm btn-default js_website #{website.selected ? 'active' : ''}"
+ <button t-attf-class="btn btn-default js_website #{website.selected ? 'active' : ''}"
t-att-data-website-id="website.id">
<t t-esc="website.name"/>
</button>
diff --git a/addons/website/static/src/xml/website.pageProperties.xml b/addons/website/static/src/xml/website.pageProperties.xml
index 7ac590cda2f..cf4719d5951 100644
--- a/addons/website/static/src/xml/website.pageProperties.xml
+++ b/addons/website/static/src/xml/website.pageProperties.xml
@@ -45,7 +45,7 @@
<li class="nav-item"><a aria-controls="advances_page_info" role="tab" data-toggle="tab" class="nav-link" href="#advances_page_info">Publish</a></li>
</ul>
<div class="tab-content mt16">
- <div role="tabpanel" id="basic_page_info" class="tab-pane fade in active">
+ <div role="tabpanel" id="basic_page_info" class="tab-pane fade show active">
<div class="form-group row">
<label class="col-form-label col-md-3" for="page_name">Page Name</label>
<div class="col-md-9">
@@ -88,7 +88,7 @@
</div>
</div>
<div role="tabpanel" id="advances_page_info" class="tab-pane fade">
- <div class="form-group">
+ <div class="form-group row">
<label class="control-label col-md-5" for="is_menu">Show in Top Menu</label>
<div class="col-sm-2">
<label class="o_switch" for="is_menu" >
@@ -97,7 +97,7 @@
</label>
</div>
</div>
- <div class="form-group">
+ <div class="form-group row">
<label class="control-label col-md-5" for="is_homepage">Use as Homepage</label>
<div class="col-sm-2">
<label class="o_switch" for="is_homepage" >
@@ -106,7 +106,7 @@
</label>
</div>
</div>
- <div class="form-group">
+ <div class="form-group row">
<label class="control-label col-md-5" for="is_indexed">
Indexed
<i class="fa fa-question-circle-o" title="Hide this page from search results" role="img" aria-label="Info"></i>
@@ -118,7 +118,7 @@
</label>
</div>
</div>
- <div class="form-group">
+ <div class="form-group row">
<label class="control-label col-md-5" for="is_published">Publish</label>
<div class="col-sm-2">
<label class="o_switch js_publish_btn" for="is_published">
@@ -127,7 +127,7 @@
</label>
</div>
</div>
- <div t-if='widget.page.website_id' class="form-group" id="website_restriction">
+ <div t-if='widget.page.website_id' class="form-group row" id="website_restriction">
<!-- TODO hide with multi-website group -->
<label class="control-label col-md-5" for="share_page_info">
Share this page
@@ -142,9 +142,9 @@
</a>
</div>
</div>
- <div class="form-group">
+ <div class="form-group row">
<label class="control-label col-md-5" for="date_publish">Publishing Date</label>
- <div class="col-sm-7">
+ <div class="col-md-7">
<div class='input-group date' id='date_publish_container'>
<input type='text' class="form-control" name="date_publish" id="date_publish" />
<div class="input-group-append">