diff options
Diffstat (limited to 'addons')
| -rw-r--r-- | addons/project/controllers/rating.py | 2 | ||||
| -rw-r--r-- | addons/survey/controllers/main.py | 2 | ||||
| -rw-r--r-- | addons/test_website/controllers/main.py | 2 | ||||
| -rw-r--r-- | addons/test_website/data/test_website_data.xml | 1 | ||||
| -rw-r--r-- | addons/website/controllers/main.py | 2 | ||||
| -rw-r--r-- | addons/website_crm/views/website_crm_templates.xml | 10 | ||||
| -rw-r--r-- | addons/website_form/views/website_form_templates.xml | 1 | ||||
| -rw-r--r-- | addons/website_google_map/controllers/main.py | 2 | ||||
| -rw-r--r-- | addons/website_hr_recruitment/views/website_hr_recruitment_templates.xml | 1 | ||||
| -rw-r--r-- | addons/website_livechat/controllers/main.py | 2 | ||||
| -rw-r--r-- | addons/website_sale/controllers/main.py | 20 | ||||
| -rw-r--r-- | addons/website_sale_comparison/controllers/main.py | 2 | ||||
| -rw-r--r-- | addons/website_sale_wishlist/controllers/main.py | 2 |
13 files changed, 26 insertions, 23 deletions
diff --git a/addons/project/controllers/rating.py b/addons/project/controllers/rating.py index 3df60f3f063..b3af39a3d68 100644 --- a/addons/project/controllers/rating.py +++ b/addons/project/controllers/rating.py @@ -9,7 +9,7 @@ from odoo.http import request class RatingProject(http.Controller): - @http.route(['/project/rating/'], type='http', auth="public", website=True) + @http.route(['/project/rating'], type='http', auth="public", website=True) def index(self, **kw): projects = request.env['project.project'].sudo().search([('rating_status', '!=', 'no'), ('portal_show_rating', '=', True)]) values = {'projects': projects} diff --git a/addons/survey/controllers/main.py b/addons/survey/controllers/main.py index b9e3856d479..63a463e95a9 100644 --- a/addons/survey/controllers/main.py +++ b/addons/survey/controllers/main.py @@ -441,7 +441,7 @@ class Survey(http.Controller): # COMPLETED SURVEY ROUTES # ------------------------------------------------------------ - @http.route('/survey/print/<string:survey_token>', type='http', auth='public', website=True) + @http.route('/survey/print/<string:survey_token>', type='http', auth='public', website=True, sitemap=False) def survey_print(self, survey_token, review=False, answer_token=None, **post): '''Display an survey in printable view; if <answer_token> is set, it will grab the answers of the user_input_id that has <answer_token>.''' diff --git a/addons/test_website/controllers/main.py b/addons/test_website/controllers/main.py index 1fc9f8e54e6..6b4328287e0 100644 --- a/addons/test_website/controllers/main.py +++ b/addons/test_website/controllers/main.py @@ -12,7 +12,7 @@ from odoo.exceptions import UserError, ValidationError, AccessError, MissingErro class WebsiteTest(Home): - @http.route('/test_view', type='http', auth='public', website=True) + @http.route('/test_view', type='http', auth='public', website=True, sitemap=False) def test_view(self, **kwargs): return request.render('test_website.test_view') diff --git a/addons/test_website/data/test_website_data.xml b/addons/test_website/data/test_website_data.xml index 4327bf597f8..e970f69484e 100644 --- a/addons/test_website/data/test_website_data.xml +++ b/addons/test_website/data/test_website_data.xml @@ -70,6 +70,7 @@ <field name="is_published">True</field> <field name="url">/test_page_view</field> <field name="view_id" ref="test_page_view"/> + <field name="website_indexed" eval="False"/> </record> <record id="test_view_to_be_t_called" model="ir.ui.view"> <field name="name">Test View To Be t-called</field> diff --git a/addons/website/controllers/main.py b/addons/website/controllers/main.py index 57e7aab7bbe..3cfd95fdce2 100644 --- a/addons/website/controllers/main.py +++ b/addons/website/controllers/main.py @@ -468,7 +468,7 @@ class WebsiteBinary(http.Controller): kw['unique'] = unique return Binary().content_image(**kw) - @http.route(['/favicon.ico'], type='http', auth='public', website=True) + @http.route(['/favicon.ico'], type='http', auth='public', website=True, sitemap=False) def favicon(self, **kw): # when opening a pdf in chrome, chrome tries to open the default favicon url return self.content_image(model='website', id=str(request.website.id), field='favicon', **kw) diff --git a/addons/website_crm/views/website_crm_templates.xml b/addons/website_crm/views/website_crm_templates.xml index 21186b437fc..a62eae17c89 100644 --- a/addons/website_crm/views/website_crm_templates.xml +++ b/addons/website_crm/views/website_crm_templates.xml @@ -51,11 +51,11 @@ </xpath> </template> - <template id="assets_editor" name="Website CRM Assets Editor" inherit_id="website.assets_editor"> - <xpath expr="." position="inside"> - <script type="text/javascript" src="/website_crm/static/src/js/website_crm_editor.js"></script> - </xpath> - </template> + <template id="assets_editor" name="Website CRM Assets Editor" inherit_id="website.assets_editor"> + <xpath expr="." position="inside"> + <script type="text/javascript" src="/website_crm/static/src/js/website_crm_editor.js"></script> + </xpath> + </template> <template id="assets_tests" name="Website CRM Assets Tests" inherit_id="web.assets_tests"> <xpath expr="." position="inside"> diff --git a/addons/website_form/views/website_form_templates.xml b/addons/website_form/views/website_form_templates.xml index a0d52b017e4..ea6e3a5a9aa 100644 --- a/addons/website_form/views/website_form_templates.xml +++ b/addons/website_form/views/website_form_templates.xml @@ -74,6 +74,7 @@ <field name="name">Thanks (Contact us)</field> <field name="type">qweb</field> <field name="url">/contactus-thank-you</field> + <field name="website_indexed" eval="False"/> <field name="is_published">True</field> <field name="key">website_form.contactus_thanks</field> <field name="arch" type="xml"> diff --git a/addons/website_google_map/controllers/main.py b/addons/website_google_map/controllers/main.py index afa7dd784f4..b4ad02a57fb 100644 --- a/addons/website_google_map/controllers/main.py +++ b/addons/website_google_map/controllers/main.py @@ -24,7 +24,7 @@ class GoogleMap(http.Controller): directives ``width`` and ``height``. ''' - @http.route(['/google_map'], type='http', auth="public", website=True) + @http.route(['/google_map'], type='http', auth="public", website=True, sitemap=False) def google_map(self, *arg, **post): clean_ids = [] for partner_id in post.get('partner_ids', "").split(","): diff --git a/addons/website_hr_recruitment/views/website_hr_recruitment_templates.xml b/addons/website_hr_recruitment/views/website_hr_recruitment_templates.xml index 331bd9baff0..1a0e6e8e9b6 100644 --- a/addons/website_hr_recruitment/views/website_hr_recruitment_templates.xml +++ b/addons/website_hr_recruitment/views/website_hr_recruitment_templates.xml @@ -399,6 +399,7 @@ <record id="thankyou" model="website.page"> <field name="url">/job-thank-you</field> <field name="is_published">True</field> + <field name="website_indexed" eval="False"/> <field name="name">Thank you (Recruitment)</field> <field name="type">qweb</field> <field name="key">website_hr_recruitment.thankyou</field> diff --git a/addons/website_livechat/controllers/main.py b/addons/website_livechat/controllers/main.py index f6a5b90fc0c..989d817d2ef 100644 --- a/addons/website_livechat/controllers/main.py +++ b/addons/website_livechat/controllers/main.py @@ -7,7 +7,7 @@ from odoo.http import request class WebsiteLivechat(http.Controller): - @http.route('/livechat/', type='http', auth="public", website=True) + @http.route('/livechat', type='http', auth="public", website=True) def channel_list(self, **kw): # display the list of the channel channels = request.env['im_livechat.channel'].search([('website_published', '=', True)]) diff --git a/addons/website_sale/controllers/main.py b/addons/website_sale/controllers/main.py index a11124e8207..91542537232 100644 --- a/addons/website_sale/controllers/main.py +++ b/addons/website_sale/controllers/main.py @@ -371,7 +371,7 @@ class WebsiteSale(http.Controller): request.website.sale_get_order(code=promo) return request.redirect(redirect) - @http.route(['/shop/cart'], type='http', auth="public", website=True) + @http.route(['/shop/cart'], type='http', auth="public", website=True, sitemap=False) def cart(self, access_token=None, revive='', **post): """ Main cart management + abandoned cart revival @@ -635,7 +635,7 @@ class WebsiteSale(http.Controller): return new_values, errors, error_msg - @http.route(['/shop/address'], type='http', methods=['GET', 'POST'], auth="public", website=True) + @http.route(['/shop/address'], type='http', methods=['GET', 'POST'], auth="public", website=True, sitemap=False) def address(self, **kw): Partner = request.env['res.partner'].with_context(show_address=1).sudo() order = request.website.sale_get_order() @@ -722,7 +722,7 @@ class WebsiteSale(http.Controller): } return request.render("website_sale.address", render_values) - @http.route(['/shop/checkout'], type='http', auth="public", website=True) + @http.route(['/shop/checkout'], type='http', auth="public", website=True, sitemap=False) def checkout(self, **post): order = request.website.sale_get_order() @@ -749,7 +749,7 @@ class WebsiteSale(http.Controller): return 'ok' return request.render("website_sale.checkout", values) - @http.route(['/shop/confirm_order'], type='http', auth="public", website=True) + @http.route(['/shop/confirm_order'], type='http', auth="public", website=True, sitemap=False) def confirm_order(self, **post): order = request.website.sale_get_order() @@ -770,7 +770,7 @@ class WebsiteSale(http.Controller): # ------------------------------------------------------ # Extra step # ------------------------------------------------------ - @http.route(['/shop/extra_info'], type='http', auth="public", website=True) + @http.route(['/shop/extra_info'], type='http', auth="public", website=True, sitemap=False) def extra_info(self, **post): # Check that this option is activated extra_step = request.website.viewref('website_sale.extra_info_option') @@ -836,7 +836,7 @@ class WebsiteSale(http.Controller): values['acq_extra_fees'] = acquirers.get_acquirer_extra_fees(order.amount_total, order.currency_id, order.partner_id.country_id.id) return values - @http.route(['/shop/payment'], type='http', auth="public", website=True) + @http.route(['/shop/payment'], type='http', auth="public", website=True, sitemap=False) def payment(self, **post): """ Payment step. This page proposes several payment means based on available payment.acquirer. State at this point : @@ -920,7 +920,7 @@ class WebsiteSale(http.Controller): request.session['__website_sale_last_tx_id'] = transaction.id return transaction.render_sale_button(order) - @http.route('/shop/payment/token', type='http', auth='public', website=True) + @http.route('/shop/payment/token', type='http', auth='public', website=True, sitemap=False) def payment_token(self, pm_id=None, **kwargs): """ Method that handles payment using saved tokens @@ -964,7 +964,7 @@ class WebsiteSale(http.Controller): }) } - @http.route('/shop/payment/validate', type='http', auth="public", website=True) + @http.route('/shop/payment/validate', type='http', auth="public", website=True, sitemap=False) def payment_validate(self, transaction_id=None, sale_order_id=None, **post): """ Method that should be called by the server when receiving an update for a transaction. State at this point : @@ -1005,7 +1005,7 @@ class WebsiteSale(http.Controller): def terms(self, **kw): return request.render("website_sale.terms") - @http.route(['/shop/confirmation'], type='http', auth="public", website=True) + @http.route(['/shop/confirmation'], type='http', auth="public", website=True, sitemap=False) def payment_confirmation(self, **post): """ End of checkout process controller. Confirmation is basically seing the status of a sale.order. State at this point : @@ -1021,7 +1021,7 @@ class WebsiteSale(http.Controller): else: return request.redirect('/shop') - @http.route(['/shop/print'], type='http', auth="public", website=True) + @http.route(['/shop/print'], type='http', auth="public", website=True, sitemap=False) def print_saleorder(self, **kwargs): sale_order_id = request.session.get('sale_last_order_id') if sale_order_id: diff --git a/addons/website_sale_comparison/controllers/main.py b/addons/website_sale_comparison/controllers/main.py index c977063665f..68c9a73a415 100644 --- a/addons/website_sale_comparison/controllers/main.py +++ b/addons/website_sale_comparison/controllers/main.py @@ -7,7 +7,7 @@ import json class WebsiteSaleProductComparison(WebsiteSale): - @http.route('/shop/compare/', type='http', auth="public", website=True) + @http.route('/shop/compare/', type='http', auth="public", website=True, sitemap=False) def product_compare(self, **post): values = {} product_ids = [int(i) for i in post.get('products', '').split(',') if i.isdigit()] diff --git a/addons/website_sale_wishlist/controllers/main.py b/addons/website_sale_wishlist/controllers/main.py index b494aeb927d..05f1c984831 100644 --- a/addons/website_sale_wishlist/controllers/main.py +++ b/addons/website_sale_wishlist/controllers/main.py @@ -35,7 +35,7 @@ class WebsiteSaleWishlist(WebsiteSale): return wish_id - @http.route(['/shop/wishlist'], type='http', auth="public", website=True) + @http.route(['/shop/wishlist'], type='http', auth="public", website=True, sitemap=False) def get_wishlist(self, count=False, **kw): values = request.env['product.wishlist'].with_context(display_default_code=False).current() if count: |
