diff --git a/addons/website/static/src/js/website.js b/addons/website/static/src/js/website.js index e90a6dd41e5..0deb98a8b20 100644 --- a/addons/website/static/src/js/website.js +++ b/addons/website/static/src/js/website.js @@ -382,4 +382,31 @@ $(function(){ } }); +$(function () { + $(document).on('click', '.js_publish, .js_unpublish', function (e) { + e.preventDefault(); + var $link = $(this).parent(); + $link.find('.js_publish, .js_unpublish').addClass("hidden"); + var $unp = $link.find(".js_unpublish"); + var $p = $link.find(".js_publish"); + + var paths = document.location.pathname.split('/'); + var url = '/' + paths[1]; + if (paths[1] === 'page') { + url += '/' + paths[2]; + } + url += '/publish'; + + $.post(url, {'id': $link.data('id')}, function (result) { + if (+result) { + $p.addClass("hidden"); + $unp.removeClass("hidden"); + } else { + $p.removeClass("hidden"); + $unp.addClass("hidden"); + } + }); + }); +}); + }; diff --git a/addons/website/views/views.xml b/addons/website/views/views.xml index 5ec873833f0..95341002dc0 100644 --- a/addons/website/views/views.xml +++ b/addons/website/views/views.xml @@ -454,5 +454,12 @@ + + diff --git a/addons/website_event/static/src/js/website_event.js b/addons/website_event/static/src/js/website_event.js deleted file mode 100644 index 54115172481..00000000000 --- a/addons/website_event/static/src/js/website_event.js +++ /dev/null @@ -1,18 +0,0 @@ -$(document).ready(function () { - $(document).on('click', '.js_publish, .js_unpublish', function (e) { - e.preventDefault(); - var $link = $(this).parent(); - $link.find('.js_publish, .js_unpublish').addClass("hidden"); - var $unp = $link.find(".js_unpublish"); - var $p = $link.find(".js_publish"); - $.post('/event/publish', {'id': $link.data('id')}, function (result) { - if (+result) { - $p.addClass("hidden"); - $unp.removeClass("hidden"); - } else { - $p.removeClass("hidden"); - $unp.addClass("hidden"); - } - }); - }); -}); \ No newline at end of file diff --git a/addons/website_event/views/website_event.xml b/addons/website_event/views/website_event.xml index 5ef2505bc9a..1ee411f8e91 100644 --- a/addons/website_event/views/website_event.xml +++ b/addons/website_event/views/website_event.xml @@ -58,10 +58,7 @@

- - Unpublish - Publish - +
: @@ -148,10 +145,7 @@

- - Unpublish - Publish - +


diff --git a/addons/website_hr/static/src/js/website_hr.js b/addons/website_hr/static/src/js/website_hr.js deleted file mode 100644 index 632b538509f..00000000000 --- a/addons/website_hr/static/src/js/website_hr.js +++ /dev/null @@ -1,18 +0,0 @@ -$(document).ready(function () { - $(document).on('click', '.js_publish, .js_unpublish', function (e) { - e.preventDefault(); - var $link = $(this).parent(); - $link.find('.js_publish, .js_unpublish').addClass("hidden"); - var $unp = $link.find(".js_unpublish"); - var $p = $link.find(".js_publish"); - $.post('/page/website.aboutus/publish', {'id': $link.data('id')}, function (result) { - if (+result) { - $p.addClass("hidden"); - $unp.removeClass("hidden"); - } else { - $p.removeClass("hidden"); - $unp.addClass("hidden"); - } - }); - }); -}); \ No newline at end of file diff --git a/addons/website_hr/views/website_hr.xml b/addons/website_hr/views/website_hr.xml index 59ba912edb1..4092e280eb8 100644 --- a/addons/website_hr/views/website_hr.xml +++ b/addons/website_hr/views/website_hr.xml @@ -35,12 +35,7 @@
- +
diff --git a/addons/website_mail/static/src/js/blog.js b/addons/website_mail/static/src/js/blog.js index 7d62d43ba5e..4db3726123a 100644 --- a/addons/website_mail/static/src/js/blog.js +++ b/addons/website_mail/static/src/js/blog.js @@ -1,21 +1,4 @@ $(document).ready(function () { - $('.js_website_mail').on('click', '.js_publish, .js_unpublish', function (e) { - e.preventDefault(); - var $link = $(this).parent(); - $link.find('.js_publish, .js_unpublish').addClass("hidden"); - var $unp = $link.find(".js_unpublish"); - var $p = $link.find(".js_publish"); - $.post('/blog/publish', {'id': $link.data('id')}, function (result) { - if (+result) { - $p.addClass("hidden"); - $unp.removeClass("hidden"); - } else { - $p.removeClass("hidden"); - $unp.addClass("hidden"); - } - }); - }); - $form = $('.js_nav_year a:first').on('click', function (e) { e.preventDefault(); $(this).next("ul").toggle(); diff --git a/addons/website_mail/views/website_mail.xml b/addons/website_mail/views/website_mail.xml index 8fb9f82d60f..8e68559a129 100644 --- a/addons/website_mail/views/website_mail.xml +++ b/addons/website_mail/views/website_mail.xml @@ -52,10 +52,7 @@
- - Unpublish - Publish - +

@@ -66,10 +63,7 @@
  • - - Unpublish - Publish - +
    @@ -88,10 +82,7 @@
    • - - Unpublish - Publish - +

      diff --git a/addons/website_sale/static/src/js/website_sale.js b/addons/website_sale/static/src/js/website_sale.js index 8d686f3f356..795850b4666 100644 --- a/addons/website_sale/static/src/js/website_sale.js +++ b/addons/website_sale/static/src/js/website_sale.js @@ -1,22 +1,4 @@ $(document).ready(function () { - $('.oe_website_sale').on('click', '.js_publish, .js_unpublish', function (e) { - e.preventDefault(); - var $link = $(this).parent(); - $link.find('.js_publish, .js_unpublish').addClass("hidden"); - var $unp = $link.find(".js_unpublish"); - var $p = $link.find(".js_publish"); - $.post('/shop/publish', {'id': $link.data('id')}, function (result) { - if (+result) { - $p.addClass("hidden"); - $unp.removeClass("hidden"); - } else { - $p.removeClass("hidden"); - $unp.addClass("hidden"); - } - }); - }); - - $(".oe_website_sale input[name='shipping_different']").change(function() { $(".oe_website_sale .js_shipping").toggle(); }); diff --git a/addons/website_sale/views/website_sale.xml b/addons/website_sale/views/website_sale.xml index 48ecf41f64a..6599f3419db 100644 --- a/addons/website_sale/views/website_sale.xml +++ b/addons/website_sale/views/website_sale.xml @@ -138,10 +138,7 @@ Product