From 8eed1431126c425fdafcb7cae33a5c0f6883f3e9 Mon Sep 17 00:00:00 2001 From: Fabien Meghazi Date: Tue, 13 May 2014 11:35:45 +0200 Subject: [PATCH] [IMP] Invert multilang logic in route decorator. True by default, can be set to False explicitlty --- addons/auth_signup/controllers/main.py | 4 +- addons/report/controllers/main.py | 2 +- addons/stock_picking_wave/controllers/main.py | 2 +- addons/survey/controllers/main.py | 14 ++-- addons/website/controllers/main.py | 6 +- addons/website/models/ir_http.py | 2 - addons/website/models/website.py | 2 +- addons/website_blog/controllers/main.py | 8 +-- .../website_certification/controllers/main.py | 2 +- addons/website_crm/controllers/main.py | 4 +- .../controllers/main.py | 4 +- addons/website_customer/controllers/main.py | 4 +- addons/website_event/controllers/main.py | 10 +-- addons/website_event_sale/controllers/main.py | 2 +- .../website_event_track/controllers/event.py | 10 +-- addons/website_forum/controllers/main.py | 66 +++++++++---------- addons/website_forum_doc/controllers/main.py | 8 +-- addons/website_hr/controllers/main.py | 2 +- .../controllers/main.py | 8 +-- .../controllers/email_designer.py | 2 +- addons/website_membership/controllers/main.py | 4 +- addons/website_partner/controllers/main.py | 2 +- addons/website_project/controllers/main.py | 2 +- addons/website_quote/controllers/main.py | 2 +- addons/website_sale/controllers/main.py | 24 +++---- .../website_sale_delivery/controllers/main.py | 2 +- 26 files changed, 98 insertions(+), 100 deletions(-) diff --git a/addons/auth_signup/controllers/main.py b/addons/auth_signup/controllers/main.py index 8a66d3ab075..3040fafaf2b 100644 --- a/addons/auth_signup/controllers/main.py +++ b/addons/auth_signup/controllers/main.py @@ -42,7 +42,7 @@ class AuthSignupHome(openerp.addons.web.controllers.main.Home): return http.redirect_with_hash(request.params.get('redirect')) return response - @http.route('/web/signup', type='http', auth='public', website=True, multilang=True) + @http.route('/web/signup', type='http', auth='public', website=True) def web_auth_signup(self, *args, **kw): qcontext = self.get_auth_signup_qcontext() @@ -58,7 +58,7 @@ class AuthSignupHome(openerp.addons.web.controllers.main.Home): return request.render('auth_signup.signup', qcontext) - @http.route('/web/reset_password', type='http', auth='public', website=True, multilang=True) + @http.route('/web/reset_password', type='http', auth='public', website=True) def web_auth_reset_password(self, *args, **kw): qcontext = self.get_auth_signup_qcontext() diff --git a/addons/report/controllers/main.py b/addons/report/controllers/main.py index 95a1ea7636a..de3bbd63db6 100644 --- a/addons/report/controllers/main.py +++ b/addons/report/controllers/main.py @@ -39,7 +39,7 @@ class ReportController(Controller): @route([ '/report//', '/report///', - ], type='http', auth='user', website=True, multilang=True) + ], type='http', auth='user', website=True) def report_routes(self, reportname, docids=None, converter=None, **data): report_obj = request.registry['report'] cr, uid, context = request.cr, request.uid, request.context diff --git a/addons/stock_picking_wave/controllers/main.py b/addons/stock_picking_wave/controllers/main.py index 9de14934828..8aab4905933 100644 --- a/addons/stock_picking_wave/controllers/main.py +++ b/addons/stock_picking_wave/controllers/main.py @@ -4,7 +4,7 @@ from openerp.addons.web.http import request class picking_wave_report(http.Controller): @http.route('/report/stock_picking_wave.report_pickingwave/', type='http', auth='user', - website=True, multilang=True) + website=True) def report_picking_wave(self, ids): self.cr, self.uid, self.pool = request.cr, request.uid, request.registry ids = [int(i) for i in ids.split(',')] diff --git a/addons/survey/controllers/main.py b/addons/survey/controllers/main.py index 69fa12222c5..ef4fd05302a 100644 --- a/addons/survey/controllers/main.py +++ b/addons/survey/controllers/main.py @@ -76,7 +76,7 @@ class WebsiteSurvey(http.Controller): # Survey start @http.route(['/survey/start/', '/survey/start//'], - type='http', auth='public', multilang=True, website=True) + type='http', auth='public', website=True) def start_survey(self, survey, token=None, **post): cr, uid, context = request.cr, request.uid, request.context survey_obj = request.registry['survey.survey'] @@ -123,7 +123,7 @@ class WebsiteSurvey(http.Controller): # Survey displaying @http.route(['/survey/fill//', '/survey/fill///'], - type='http', auth='public', multilang=True, website=True) + type='http', auth='public', website=True) def fill_survey(self, survey, token, prev=None, **post): '''Display and validates a survey''' cr, uid, context = request.cr, request.uid, request.context @@ -173,7 +173,7 @@ class WebsiteSurvey(http.Controller): # AJAX prefilling of a survey @http.route(['/survey/prefill//', '/survey/prefill///'], - type='http', auth='public', multilang=True, website=True) + type='http', auth='public', website=True) def prefill(self, survey, token, page=None, **post): cr, uid, context = request.cr, request.uid, request.context user_input_line_obj = request.registry['survey.user_input_line'] @@ -216,7 +216,7 @@ class WebsiteSurvey(http.Controller): # AJAX scores loading for quiz correction mode @http.route(['/survey/scores//'], - type='http', auth='public', multilang=True, website=True) + type='http', auth='public', website=True) def get_scores(self, survey, token, page=None, **post): cr, uid, context = request.cr, request.uid, request.context user_input_line_obj = request.registry['survey.user_input_line'] @@ -234,7 +234,7 @@ class WebsiteSurvey(http.Controller): # AJAX submission of a page @http.route(['/survey/submit/'], - type='http', auth='public', multilang=True, website=True) + type='http', auth='public', website=True) def submit(self, survey, **post): _logger.debug('Incoming data: %s', post) page_id = int(post['page_id']) @@ -284,7 +284,7 @@ class WebsiteSurvey(http.Controller): # Printing routes @http.route(['/survey/print/', '/survey/print//'], - type='http', auth='public', multilang=True, website=True) + type='http', auth='public', website=True) def print_survey(self, survey, token=None, **post): '''Display an survey in printable view; if is set, it will grab the answers of the user_input_id that has .''' @@ -295,7 +295,7 @@ class WebsiteSurvey(http.Controller): 'quizz_correction': True if survey.quizz_mode and token else False}) @http.route(['/survey/results/'], - type='http', auth='user', multilang=True, website=True) + type='http', auth='user', website=True) def survey_reporting(self, survey, token=None, **post): '''Display survey Results & Statistics for given survey.''' result_template, current_filters, filter_display_data, filter_finish = 'survey.result', [], [], False diff --git a/addons/website/controllers/main.py b/addons/website/controllers/main.py index 4180ecf4c69..a4faa9c361f 100644 --- a/addons/website/controllers/main.py +++ b/addons/website/controllers/main.py @@ -32,7 +32,7 @@ class Website(openerp.addons.web.controllers.main.Home): #------------------------------------------------------ # View #------------------------------------------------------ - @http.route('/', type='http', auth="public", website=True, multilang=True) + @http.route('/', type='http', auth="public", website=True) def index(self, **kw): page = 'homepage' try: @@ -47,12 +47,12 @@ class Website(openerp.addons.web.controllers.main.Home): pass return self.page(page) - @http.route(website=True, auth="public", multilang=True) + @http.route(website=True, auth="public") def web_login(self, *args, **kw): # TODO: can't we just put auth=public, ... in web client ? return super(Website, self).web_login(*args, **kw) - @http.route('/page/', type='http', auth="public", website=True, multilang=True) + @http.route('/page/', type='http', auth="public", website=True) def page(self, page, **opt): values = { 'path': page, diff --git a/addons/website/models/ir_http.py b/addons/website/models/ir_http.py index b25509180b0..358f105b0d0 100644 --- a/addons/website/models/ir_http.py +++ b/addons/website/models/ir_http.py @@ -46,12 +46,10 @@ class ir_http(orm.AbstractModel): try: func, arguments = self._find_handler() request.website_enabled = func.routing.get('website', False) - request.website_multilang = func.routing.get('multilang', False) except werkzeug.exceptions.NotFound: # either we have a language prefixed route, either a real 404 # in all cases, website processes them request.website_enabled = True - request.website_multilang = True if request.website_enabled: if func: diff --git a/addons/website/models/website.py b/addons/website/models/website.py index 5e339a21d03..35bae23a7da 100644 --- a/addons/website/models/website.py +++ b/addons/website/models/website.py @@ -72,7 +72,7 @@ def is_multilang_url(local_url, langs=None): query_string = url[1] if len(url) > 1 else None router = request.httprequest.app.get_db_router(request.db).bind('') func = router.match(path, query_args=query_string)[0] - return func.routing.get('multilang', False) + return func.routing.get('website', False) and func.routing.get('multilang', True) except Exception: return False diff --git a/addons/website_blog/controllers/main.py b/addons/website_blog/controllers/main.py index e33905272a3..4e81c3b4437 100644 --- a/addons/website_blog/controllers/main.py +++ b/addons/website_blog/controllers/main.py @@ -62,7 +62,7 @@ class WebsiteBlog(http.Controller): @http.route([ '/blog', '/blog/page/', - ], type='http', auth="public", website=True, multilang=True) + ], type='http', auth="public", website=True) def blogs(self, page=1, **post): cr, uid, context = request.cr, request.uid, request.context blog_obj = request.registry['blog.post'] @@ -87,7 +87,7 @@ class WebsiteBlog(http.Controller): '/blog//page/', '/blog//tag/', '/blog//tag//page/', - ], type='http', auth="public", website=True, multilang=True) + ], type='http', auth="public", website=True) def blog(self, blog=None, tag=None, page=1, **opt): """ Prepare all values to display the blog. @@ -156,7 +156,7 @@ class WebsiteBlog(http.Controller): @http.route([ '''/blog//post/'], type='http', auth='public', - website=True, multilang=True) + website=True) def certified_partners(self, cert_type=None, **post): cr, uid, context = request.cr, request.uid, request.context certification_obj = request.registry['certification.certification'] diff --git a/addons/website_crm/controllers/main.py b/addons/website_crm/controllers/main.py index 163e3ee9793..909e7cc9afb 100644 --- a/addons/website_crm/controllers/main.py +++ b/addons/website_crm/controllers/main.py @@ -16,7 +16,7 @@ class contactus(http.Controller): ) return url - @http.route(['/page/website.contactus'], type='http', auth="public", website=True, multilang=True) + @http.route(['/page/website.contactus'], type='http', auth="public", website=True) def contact(self, **kwargs): values = {} for field in ['description', 'partner_name', 'phone', 'contact_name', 'email_from', 'name']: @@ -26,7 +26,7 @@ class contactus(http.Controller): print values return request.website.render("website.contactus", values) - @http.route(['/crm/contactus'], type='http', auth="public", website=True, multilang=True) + @http.route(['/crm/contactus'], type='http', auth="public", website=True) def contactus(self, description=None, partner_name=None, phone=None, contact_name=None, email_from=None, name=None, **kwargs): post = {} post['description'] = description diff --git a/addons/website_crm_partner_assign/controllers/main.py b/addons/website_crm_partner_assign/controllers/main.py index 4f5639237f4..b4bf893b368 100644 --- a/addons/website_crm_partner_assign/controllers/main.py +++ b/addons/website_crm_partner_assign/controllers/main.py @@ -29,7 +29,7 @@ class WebsiteCrmPartnerAssign(http.Controller): '/partners/grade//country//page/', '/partners/grade//country/-/page/', - ], type='http', auth="public", website=True, multilang=True) + ], type='http', auth="public", website=True) def partners(self, country_id=0, grade_id=0, page=0, **post): country_obj = request.registry['res.country'] partner_obj = request.registry['res.partner'] @@ -111,7 +111,7 @@ class WebsiteCrmPartnerAssign(http.Controller): return request.website.render("website_crm_partner_assign.index", values) # Do not use semantic controller due to SUPERUSER_ID - @http.route(['/partners/', '/partners/-'], type='http', auth="public", website=True, multilang=True) + @http.route(['/partners/', '/partners/-'], type='http', auth="public", website=True) def partners_ref(self, partner_id, **post): partner = request.registry['res.partner'].browse(request.cr, SUPERUSER_ID, partner_id, context=request.context) values = website_partner.get_partner_template_value(partner) diff --git a/addons/website_customer/controllers/main.py b/addons/website_customer/controllers/main.py index 5f0825e132c..ea8b28cf246 100644 --- a/addons/website_customer/controllers/main.py +++ b/addons/website_customer/controllers/main.py @@ -18,7 +18,7 @@ class WebsiteCustomer(http.Controller): '/customers/country/-', '/customers/country//page/', '/customers/country/-/page/', - ], type='http', auth="public", website=True, multilang=True) + ], type='http', auth="public", website=True) def customers(self, country_id=0, page=0, **post): cr, uid, context = request.cr, request.uid, request.context country_obj = request.registry['res.country'] @@ -83,7 +83,7 @@ class WebsiteCustomer(http.Controller): } return request.website.render("website_customer.index", values) - @http.route(['/customers/', '/customers/-'], type='http', auth="public", website=True, multilang=True) + @http.route(['/customers/', '/customers/-'], type='http', auth="public", website=True) def customer(self, partner_id, **post): partner = request.registry['res.partner'].browse(request.cr, SUPERUSER_ID, partner_id, context=request.context) values = website_partner.get_partner_template_value(partner) diff --git a/addons/website_event/controllers/main.py b/addons/website_event/controllers/main.py index 9de29335eb7..5cd3ffda72b 100644 --- a/addons/website_event/controllers/main.py +++ b/addons/website_event/controllers/main.py @@ -43,7 +43,7 @@ except ImportError: _logger.warn("Please install GeoIP python module to use events localisation.") class website_event(http.Controller): - @http.route(['/event', '/event/page/'], type='http', auth="public", website=True, multilang=True) + @http.route(['/event', '/event/page/'], type='http', auth="public", website=True) def events(self, page=1, **searches): cr, uid, context = request.cr, request.uid, request.context event_obj = request.registry['event.event'] @@ -170,7 +170,7 @@ class website_event(http.Controller): return request.website.render("website_event.index", values) - @http.route(['/event//page/'], type='http', auth="public", website=True, multilang=True) + @http.route(['/event//page/'], type='http', auth="public", website=True) def event_page(self, event, page, **post): values = { 'event': event, @@ -178,7 +178,7 @@ class website_event(http.Controller): } return request.website.render(page, values) - @http.route(['/event/'], type='http', auth="public", website=True, multilang=True) + @http.route(['/event/'], type='http', auth="public", website=True) def event(self, event, **post): if event.menu_id and event.menu_id.child_id: target_url = event.menu_id.child_id[0].url @@ -188,7 +188,7 @@ class website_event(http.Controller): target_url += '?enable_editor=1' return request.redirect(target_url); - @http.route(['/event//register'], type='http', auth="public", website=True, multilang=True) + @http.route(['/event//register'], type='http', auth="public", website=True) def event_register(self, event, **post): values = { 'event': event, @@ -197,7 +197,7 @@ class website_event(http.Controller): } return request.website.render("website_event.event_description_full", values) - @http.route('/event/add_event', type='http', auth="user", multilang=True, methods=['POST'], website=True) + @http.route('/event/add_event', type='http', auth="user", methods=['POST'], website=True) def add_event(self, event_name="New Event", **kwargs): return self._add_event(event_name, request.context, **kwargs) diff --git a/addons/website_event_sale/controllers/main.py b/addons/website_event_sale/controllers/main.py index 1c39484f8c8..ec9dda5957c 100644 --- a/addons/website_event_sale/controllers/main.py +++ b/addons/website_event_sale/controllers/main.py @@ -28,7 +28,7 @@ from openerp.tools.translate import _ class website_event(website_event): - @http.route(['/event/cart/update'], type='http', auth="public", methods=['POST'], website=True, multilang=True) + @http.route(['/event/cart/update'], type='http', auth="public", methods=['POST'], website=True) def cart_update(self, event_id, **post): cr, uid, context = request.cr, request.uid, request.context ticket_obj = request.registry.get('event.event.ticket') diff --git a/addons/website_event_track/controllers/event.py b/addons/website_event_track/controllers/event.py index 4a3d814960e..1cd7d9eeea7 100644 --- a/addons/website_event_track/controllers/event.py +++ b/addons/website_event_track/controllers/event.py @@ -33,7 +33,7 @@ import pytz from pytz import timezone class website_event(http.Controller): - @http.route(['''/event//track//track//track_proposal/post'], type='http', auth="public", methods=['POST'], website=True, multilang=True) + @http.route(['/event//track_proposal/post'], type='http', auth="public", methods=['POST'], website=True) def event_track_proposal_post(self, event, **post): cr, uid, context = request.cr, request.uid, request.context diff --git a/addons/website_forum/controllers/main.py b/addons/website_forum/controllers/main.py index 2ff12c3d342..244a6e9f98d 100644 --- a/addons/website_forum/controllers/main.py +++ b/addons/website_forum/controllers/main.py @@ -65,7 +65,7 @@ class WebsiteForum(http.Controller): # Forum # -------------------------------------------------- - @http.route(['/forum'], type='http', auth="public", website=True, multilang=True) + @http.route(['/forum'], type='http', auth="public", website=True) def forum(self, **kwargs): cr, uid, context = request.cr, request.uid, request.context Forum = request.registry['forum.forum'] @@ -73,14 +73,14 @@ class WebsiteForum(http.Controller): forums = Forum.browse(cr, uid, obj_ids, context=context) return request.website.render("website_forum.forum_all", {'forums': forums}) - @http.route('/forum/new', type='http', auth="user", multilang=True, website=True) + @http.route('/forum/new', type='http', auth="user", website=True) def forum_create(self, forum_name="New Forum", **kwargs): forum_id = request.registry['forum.forum'].create(request.cr, request.uid, { 'name': forum_name, }, context=request.context) return request.redirect("/forum/%s" % slug(forum_id)) - @http.route('/forum/notification_read', type='json', auth="user", multilang=True, methods=['POST'], website=True) + @http.route('/forum/notification_read', type='json', auth="user", methods=['POST'], website=True) def notification_read(self, **kwargs): request.registry['mail.message'].set_message_read(request.cr, request.uid, [int(kwargs.get('notification_id'))], read=True, context=request.context) return True @@ -88,7 +88,7 @@ class WebsiteForum(http.Controller): @http.route(['/forum/', '/forum//page/', '''/forum//tag//faq'], type='http', auth="public", website=True, multilang=True) + @http.route(['/forum//faq'], type='http', auth="public", website=True) def forum_faq(self, forum, **post): values = self._prepare_forum_values(forum=forum, searches=dict(), header={'is_guidelines': True}, **post) return request.website.render("website_forum.faq", values) - @http.route('/forum/get_tags', type='http', auth="public", multilang=True, methods=['GET'], website=True) + @http.route('/forum/get_tags', type='http', auth="public", methods=['GET'], website=True) def tag_read(self, **post): tags = request.registry['forum.tag'].search_read(request.cr, request.uid, [], ['name'], context=request.context) data = [tag['name'] for tag in tags] return simplejson.dumps(data) - @http.route(['/forum//tag'], type='http', auth="public", website=True, multilang=True) + @http.route(['/forum//tag'], type='http', auth="public", website=True) def tags(self, forum, page=1, **post): cr, uid, context = request.cr, request.uid, request.context Tag = request.registry['forum.tag'] @@ -160,14 +160,14 @@ class WebsiteForum(http.Controller): # Questions # -------------------------------------------------- - @http.route(['/forum//ask'], type='http', auth="public", website=True, multilang=True) + @http.route(['/forum//ask'], type='http', auth="public", website=True) def question_ask(self, forum, **post): if not request.session.uid: return login_redirect() values = self._prepare_forum_values(forum=forum, searches={}, header={'ask_hide': True}) return request.website.render("website_forum.ask_question", values) - @http.route('/forum//question/new', type='http', auth="user", multilang=True, methods=['POST'], website=True) + @http.route('/forum//question/new', type='http', auth="user", methods=['POST'], website=True) def question_create(self, forum, **post): cr, uid, context = request.cr, request.uid, request.context Tag = request.registry['forum.tag'] @@ -190,7 +190,7 @@ class WebsiteForum(http.Controller): }, context=context) return werkzeug.utils.redirect("/forum/%s/question/%s" % (slug(forum), new_question_id)) - @http.route(['''/forum//question//question//question//toggle_favourite', type='json', auth="user", multilang=True, methods=['POST'], website=True) + @http.route('/forum//question//toggle_favourite', type='json', auth="user", methods=['POST'], website=True) def question_toggle_favorite(self, forum, question, **post): if not request.session.uid: return {'error': 'anonymous_user'} @@ -220,7 +220,7 @@ class WebsiteForum(http.Controller): request.registry['forum.post'].write(request.cr, request.uid, [question.id], {'favourite_ids': favourite_ids}, context=request.context) return favourite - @http.route('/forum//question//ask_for_close', type='http', auth="user", multilang=True, website=True) + @http.route('/forum//question//ask_for_close', type='http', auth="user", website=True) def question_ask_for_close(self, forum, question, **post): check_res = self._has_enough_karma(question.create_uid.id == request.uid and '_karma_modo_close_own' or '_karma_modo_close_all') if not check_res[0]: @@ -240,7 +240,7 @@ class WebsiteForum(http.Controller): }) return request.website.render("website_forum.close_question", values) - @http.route('/forum//question//edit_answer', type='http', auth="user", website=True, multilang=True) + @http.route('/forum//question//edit_answer', type='http', auth="user", website=True) def question_edit_answer(self, forum, question, **kwargs): for record in question.child_ids: if record.create_uid.id == request.uid: @@ -248,7 +248,7 @@ class WebsiteForum(http.Controller): break return werkzeug.utils.redirect("/forum/%s/post/%s/edit" % (slug(forum), slug(answer))) - @http.route('/forum//question//close', type='http', auth="user", multilang=True, methods=['POST'], website=True) + @http.route('/forum//question//close', type='http', auth="user", methods=['POST'], website=True) def question_close(self, forum, question, **post): check_res = self._has_enough_karma(question.create_uid.id == request.uid and '_karma_modo_close_own' or '_karma_modo_close_all') if not check_res[0]: @@ -262,7 +262,7 @@ class WebsiteForum(http.Controller): }, context=request.context) return werkzeug.utils.redirect("/forum/%s/question/%s" % (slug(forum), slug(question))) - @http.route('/forum//question//reopen', type='http', auth="user", multilang=True, website=True) + @http.route('/forum//question//reopen', type='http', auth="user", website=True) def question_reopen(self, forum, question, **kwarg): check_res = self._has_enough_karma(question.create_uid.id == request.uid and '_karma_modo_close_own' or '_karma_modo_close_all') if not check_res[0]: @@ -271,7 +271,7 @@ class WebsiteForum(http.Controller): request.registry['forum.post'].write(request.cr, request.uid, [question.id], {'state': 'active'}, context=request.context) return werkzeug.utils.redirect("/forum/%s/question/%s" % (slug(forum), slug(question))) - @http.route('/forum//question//delete', type='http', auth="user", multilang=True, website=True) + @http.route('/forum//question//delete', type='http', auth="user", website=True) def question_delete(self, forum, question, **kwarg): check_res = self._has_enough_karma(question.create_uid.id == request.uid and '_karma_modo_unlink_own' or '_karma_modo_unlink_all') if not check_res[0]: @@ -280,7 +280,7 @@ class WebsiteForum(http.Controller): request.registry['forum.post'].write(request.cr, request.uid, [question.id], {'active': False}, context=request.context) return werkzeug.utils.redirect("/forum/%s/question/%s" % (slug(forum), slug(question))) - @http.route('/forum//question//undelete', type='http', auth="user", multilang=True, website=True) + @http.route('/forum//question//undelete', type='http', auth="user", website=True) def question_undelete(self, forum, question, **kwarg): check_res = self._has_enough_karma(question.create_uid.id == request.uid and '_karma_modo_unlink_own' or '_karma_modo_unlink_all') if not check_res[0]: @@ -292,7 +292,7 @@ class WebsiteForum(http.Controller): # Post # -------------------------------------------------- - @http.route('/forum//post//new', type='http', auth="public", multilang=True, methods=['POST'], website=True) + @http.route('/forum//post//new', type='http', auth="public", methods=['POST'], website=True) def post_new(self, forum, post, **kwargs): if not request.session.uid: return login_redirect() @@ -339,7 +339,7 @@ class WebsiteForum(http.Controller): request.registry['forum.post'].write(cr, uid, [post.id], {'is_correct': not post.is_correct}, context=context) return not post.is_correct - @http.route('/forum//post//delete', type='http', auth="user", multilang=True, website=True) + @http.route('/forum//post//delete', type='http', auth="user", website=True) def post_delete(self, forum, post, **kwargs): check_res = self._has_enough_karma(post.create_uid.id == request.uid and '_karma_modo_unlink_own' or '_karma_modo_unlink_all') if not check_res[0]: @@ -351,7 +351,7 @@ class WebsiteForum(http.Controller): werkzeug.utils.redirect("/forum/%s/question/%s" % (slug(forum), slug(question))) return werkzeug.utils.redirect("/forum/%s" % slug(forum)) - @http.route('/forum//post//edit', type='http', auth="user", website=True, multilang=True) + @http.route('/forum//post//edit', type='http', auth="user", website=True) def post_edit(self, forum, post, **kwargs): check_res = self._has_enough_karma(post.create_uid.id == request.uid and '_karma_modo_edit_own' or '_karma_modo_edit_all') if not check_res[0]: @@ -369,7 +369,7 @@ class WebsiteForum(http.Controller): }) return request.website.render("website_forum.edit_post", values) - @http.route('/forum//post//save', type='http', auth="user", multilang=True, methods=['POST'], website=True) + @http.route('/forum//post//save', type='http', auth="user", methods=['POST'], website=True) def post_save(self, forum, post, **kwargs): cr, uid, context = request.cr, request.uid, request.context question_tags = [] @@ -392,7 +392,7 @@ class WebsiteForum(http.Controller): question = post.parent_id if post.parent_id else post return werkzeug.utils.redirect("/forum/%s/question/%s" % (slug(forum), slug(question))) - @http.route('/forum//post//upvote', type='json', auth="public", multilang=True, website=True) + @http.route('/forum//post//upvote', type='json', auth="public", website=True) def post_upvote(self, forum, post, **kwargs): if not request.session.uid: return {'error': 'anonymous_user'} @@ -404,7 +404,7 @@ class WebsiteForum(http.Controller): upvote = True if not post.user_vote > 0 else False return request.registry['forum.post'].vote(request.cr, request.uid, [post.id], upvote=upvote, context=request.context) - @http.route('/forum//post//downvote', type='json', auth="public", multilang=True, website=True) + @http.route('/forum//post//downvote', type='json', auth="public", website=True) def post_downvote(self, forum, post, **kwargs): if not request.session.uid: return {'error': 'anonymous_user'} @@ -419,7 +419,7 @@ class WebsiteForum(http.Controller): # User # -------------------------------------------------- - @http.route('/forum//users', type='http', auth="public", website=True, multilang=True) + @http.route('/forum//users', type='http', auth="public", website=True) def users(self, forum, page=1, **searches): cr, uid, context = request.cr, request.uid, request.context User = request.registry['res.users'] @@ -442,7 +442,7 @@ class WebsiteForum(http.Controller): return request.website.render("website_forum.users", values) - @http.route(['/forum//partner/'], type='http', auth="public", website=True, multilang=True) + @http.route(['/forum//partner/'], type='http', auth="public", website=True) def open_partner(self, forum, partner_id=0, **post): cr, uid, context = request.cr, request.uid, request.context pids = request.registry['res.partner'].search(cr, SUPERUSER_ID, [('id', '=', partner_id)], context=context) @@ -452,7 +452,7 @@ class WebsiteForum(http.Controller): return werkzeug.utils.redirect("/forum/%s/user/%d" % (slug(forum), partner.user_ids[0].id)) return werkzeug.utils.redirect("/forum/%s" % slug(forum)) - @http.route(['/forum//user/'], type='http', auth="public", website=True, multilang=True) + @http.route(['/forum//user/'], type='http', auth="public", website=True) def open_user(self, forum, user_id=0, **post): cr, uid, context = request.cr, request.uid, request.context User = request.registry['res.users'] @@ -537,7 +537,7 @@ class WebsiteForum(http.Controller): }) return request.website.render("website_forum.user_detail_full", values) - @http.route('/forum//user//edit', type='http', auth="user", multilang=True, website=True) + @http.route('/forum//user//edit', type='http', auth="user", website=True) def edit_profile(self, forum, user, **kwargs): country = request.registry['res.country'] country_ids = country.search(request.cr, SUPERUSER_ID, [], context=request.context) @@ -549,7 +549,7 @@ class WebsiteForum(http.Controller): }) return request.website.render("website_forum.edit_profile", values) - @http.route('/forum//user//save', type='http', auth="user", multilang=True, website=True) + @http.route('/forum//user//save', type='http', auth="user", website=True) def save_edited_profile(self, forum, user, **kwargs): request.registry['res.users'].write(request.cr, request.uid, [user.id], { 'name': kwargs.get('name'), @@ -564,7 +564,7 @@ class WebsiteForum(http.Controller): # Badges # -------------------------------------------------- - @http.route('/forum//badge', type='http', auth="public", website=True, multilang=True) + @http.route('/forum//badge', type='http', auth="public", website=True) def badges(self, forum, **searches): cr, uid, context = request.cr, request.uid, request.context Badge = request.registry['gamification.badge'] @@ -576,7 +576,7 @@ class WebsiteForum(http.Controller): }) return request.website.render("website_forum.badge", values) - @http.route(['''/forum//badge/'''], type='http', auth="public", website=True, multilang=True) + @http.route(['''/forum//badge/'''], type='http', auth="public", website=True) def badge_users(self, forum, badge, **kwargs): user_ids = [badge_user.user_id.id for badge_user in badge.owner_ids] users = request.registry['res.users'].browse(request.cr, SUPERUSER_ID, user_ids, context=request.context) @@ -590,7 +590,7 @@ class WebsiteForum(http.Controller): # Messaging # -------------------------------------------------- - @http.route('/forum//post//comment//convert_to_answer', type='http', auth="public", multilang=True, website=True) + @http.route('/forum//post//comment//convert_to_answer', type='http', auth="public", website=True) def convert_comment_to_answer(self, forum, post, comment, **kwarg): body = comment.body request.registry['mail.message'].unlink(request.cr, request.uid, [comment.id], context=request.context) @@ -600,7 +600,7 @@ class WebsiteForum(http.Controller): return self.post_comment(forum, answer, comment=html2plaintext(body)) return self.post_new(forum, question, content=body) - @http.route('/forum//post//convert_to_comment', type='http', auth="user", multilang=True, website=True) + @http.route('/forum//post//convert_to_comment', type='http', auth="user", website=True) def convert_answer_to_comment(self, forum, post, **kwarg): values = { 'comment': html2plaintext(post.content), @@ -609,7 +609,7 @@ class WebsiteForum(http.Controller): request.registry['forum.post'].unlink(request.cr, SUPERUSER_ID, [post.id], context=request.context) return self.post_comment(forum, question, **values) - @http.route('/forum//post//comment//delete', type='json', auth="user", multilang=True, website=True) + @http.route('/forum//post//comment//delete', type='json', auth="user", website=True) def delete_comment(self, forum, post, comment, **kwarg): request.registry['mail.message'].unlink(request.cr, SUPERUSER_ID, [comment.id], context=request.context) return True diff --git a/addons/website_forum_doc/controllers/main.py b/addons/website_forum_doc/controllers/main.py index 25fdf9aa2e4..0ac68cde38a 100644 --- a/addons/website_forum_doc/controllers/main.py +++ b/addons/website_forum_doc/controllers/main.py @@ -7,7 +7,7 @@ from openerp.addons.website.models.website import slug class WebsiteDoc(http.Controller): - @http.route(['/forum/how-to', '/forum/how-to/'], type='http', auth="public", website=True, multilang=True) + @http.route(['/forum/how-to', '/forum/how-to/'], type='http', auth="public", website=True) def toc(self, toc=None, **kwargs): cr, uid, context, toc_id = request.cr, request.uid, request.context, False if toc: @@ -26,7 +26,7 @@ class WebsiteDoc(http.Controller): } return request.website.render("website_forum_doc.documentation", value) - @http.route(['''/forum/how-to////question//promote', type='http', auth="user", multilang=True, website=True) + @http.route('/forum//question//promote', type='http', auth="user", website=True) def post_toc(self, forum, post, **kwargs): cr, uid, context, toc_id = request.cr, request.uid, request.context, False user = request.registry['res.users'].browse(cr, uid, uid, context=context) @@ -53,7 +53,7 @@ class WebsiteDoc(http.Controller): } return request.website.render("website_forum_doc.promote_question", value) - @http.route('/forum//promote_ok', type='http', auth="user", multilang=True, website=True) + @http.route('/forum//promote_ok', type='http', auth="user", website=True) def post_toc_ok(self, forum, post_id, toc_id, **kwargs): cr, uid, context = request.cr, request.uid, request.context user = request.registry['res.users'].browse(cr, uid, uid, context=context) diff --git a/addons/website_hr/controllers/main.py b/addons/website_hr/controllers/main.py index 20c865b5b89..d93d482552d 100644 --- a/addons/website_hr/controllers/main.py +++ b/addons/website_hr/controllers/main.py @@ -5,7 +5,7 @@ from openerp.addons.web.http import request class website_hr(http.Controller): - @http.route(['/page/website.aboutus'], type='http', auth="public", website=True, multilang=True) + @http.route(['/page/website.aboutus'], type='http', auth="public", website=True) def blog(self, **post): hr_obj = request.registry['hr.employee'] employee_ids = hr_obj.search(request.cr, request.uid, [('website_published', '=', True)], diff --git a/addons/website_hr_recruitment/controllers/main.py b/addons/website_hr_recruitment/controllers/main.py index 8140a39dc9b..28b960c6c91 100644 --- a/addons/website_hr_recruitment/controllers/main.py +++ b/addons/website_hr_recruitment/controllers/main.py @@ -11,7 +11,7 @@ class website_hr_recruitment(http.Controller): '/jobs', '/jobs/department/', '/jobs/office/' - ], type='http', auth="public", website=True, multilang=True) + ], type='http', auth="public", website=True) def jobs(self, department=None, office=None): context=dict(request.context, show_address=True, no_tag_br=True) cr, uid = request.cr, request.uid @@ -54,11 +54,11 @@ class website_hr_recruitment(http.Controller): job_id = request.registry.get('hr.job').create(cr, uid, value, context=context) return request.redirect("/jobs/detail/%s?enable_editor=1" % job_id) - @http.route(['/jobs/detail/'], type='http', auth="public", website=True, multilang=True) + @http.route(['/jobs/detail/'], type='http', auth="public", website=True) def jobs_detail(self, job, **kwargs): return request.website.render("website_hr_recruitment.detail", { 'job': job, 'main_object': job }) - @http.route(['/jobs/apply/'], type='http', auth="public", website=True, multilang=True) + @http.route(['/jobs/apply/'], type='http', auth="public", website=True) def jobs_apply(self, job): error = {} default = {} @@ -67,7 +67,7 @@ class website_hr_recruitment(http.Controller): default = request.session.pop('website_hr_recruitment_default') return request.website.render("website_hr_recruitment.apply", { 'job': job, 'error': error, 'default': default}) - @http.route(['/jobs/thankyou'], methods=['POST'], type='http', auth="public", website=True, multilang=True) + @http.route(['/jobs/thankyou'], methods=['POST'], type='http', auth="public", website=True) def jobs_thankyou(self, **post): cr, uid, context = request.cr, request.uid, request.context imd = request.registry['ir.model.data'] diff --git a/addons/website_mail/controllers/email_designer.py b/addons/website_mail/controllers/email_designer.py index 447474ced36..a9462f7be7d 100644 --- a/addons/website_mail/controllers/email_designer.py +++ b/addons/website_mail/controllers/email_designer.py @@ -8,7 +8,7 @@ from openerp.addons.web.http import request class WebsiteEmailDesigner(http.Controller): - @http.route('/website_mail/email_designer', type='http', auth="user", website=True, multilang=True) + @http.route('/website_mail/email_designer', type='http', auth="user", website=True) def index(self, model, res_id, template_model=None, **kw): if not model or not model in request.registry or not res_id: return request.redirect('/') diff --git a/addons/website_membership/controllers/main.py b/addons/website_membership/controllers/main.py index 11e764f0eac..568d9ba1cc5 100644 --- a/addons/website_membership/controllers/main.py +++ b/addons/website_membership/controllers/main.py @@ -28,7 +28,7 @@ class WebsiteMembership(http.Controller): '/members/association//country/', '/members/association//country/-/page/', '/members/association//country//page/', - ], type='http', auth="public", website=True, multilang=True) + ], type='http', auth="public", website=True) def members(self, membership_id=None, country_name=None, country_id=0, page=0, **post): cr, uid, context = request.cr, request.uid, request.context product_obj = request.registry['product.product'] @@ -105,7 +105,7 @@ class WebsiteMembership(http.Controller): } return request.website.render("website_membership.index", values) - @http.route(['/members/', '/members/-'], type='http', auth="public", website=True, multilang=True) + @http.route(['/members/', '/members/-'], type='http', auth="public", website=True) def partners_ref(self, partner_id, **post): partner = request.registry['res.partner'].browse(request.cr, SUPERUSER_ID, partner_id, context=request.context) values = website_partner.get_partner_template_value(partner) diff --git a/addons/website_partner/controllers/main.py b/addons/website_partner/controllers/main.py index 1e6cb9afb61..d79ee840df7 100644 --- a/addons/website_partner/controllers/main.py +++ b/addons/website_partner/controllers/main.py @@ -33,7 +33,7 @@ def get_partner_template_value(partner): return values class WebsitePartner(http.Controller): - @http.route(['/partners/', '/partners/-'], type='http', auth="public", website=True, multilang=True) + @http.route(['/partners/', '/partners/-'], type='http', auth="public", website=True) def partner(self, partner_id, **post): """ Route for displaying a single partner / customer. """ partner = request.registry['res.partner'].browse(request.cr, SUPERUSER_ID, partner_id, context=request.context) diff --git a/addons/website_project/controllers/main.py b/addons/website_project/controllers/main.py index c16d49e9f44..76a65492671 100644 --- a/addons/website_project/controllers/main.py +++ b/addons/website_project/controllers/main.py @@ -24,7 +24,7 @@ from openerp.addons.web.http import request class website_project(http.Controller): - @http.route(['/project/'], type='http', auth="public", website=True, multilang=True) + @http.route(['/project/'], type='http', auth="public", website=True) def project(self, project=None, **post): cr, uid, context = request.cr, request.uid, request.context render_values = { diff --git a/addons/website_quote/controllers/main.py b/addons/website_quote/controllers/main.py index 0cc56f29096..31ddd94a865 100644 --- a/addons/website_quote/controllers/main.py +++ b/addons/website_quote/controllers/main.py @@ -129,7 +129,7 @@ class sale_quote(http.Controller): order_line_obj.write(request.cr, SUPERUSER_ID, [line_id], {'product_uom_qty': (quantity)}, context=request.context) return [str(quantity), str(order.amount_total)] - @http.route(["/quote/template/"], type='http', auth="user", website=True, multilang=True) + @http.route(["/quote/template/"], type='http', auth="user", website=True) def template_view(self, quote, **post): values = { 'template': quote } return request.website.render('website_quote.so_template', values) diff --git a/addons/website_sale/controllers/main.py b/addons/website_sale/controllers/main.py index 1b96f8e96e9..0c2353010a4 100644 --- a/addons/website_sale/controllers/main.py +++ b/addons/website_sale/controllers/main.py @@ -114,7 +114,7 @@ class website_sale(http.Controller): '/shop/page/', '/shop/category/', '/shop/category//page/' - ], type='http', auth="public", website=True, multilang=True) + ], type='http', auth="public", website=True) def shop(self, page=0, category=None, search='', **post): cr, uid, context, pool = request.cr, request.uid, request.context, request.registry @@ -170,7 +170,7 @@ class website_sale(http.Controller): return request.website.render("website_sale.products", values) - @http.route(['/shop/product/'], type='http', auth="public", website=True, multilang=True) + @http.route(['/shop/product/'], type='http', auth="public", website=True) def product(self, product, category='', search='', **kwargs): cr, uid, context, pool = request.cr, request.uid, request.context, request.registry category_obj = pool['product.public.category'] @@ -215,7 +215,7 @@ class website_sale(http.Controller): context=dict(context, mail_create_nosubcribe=True)) return werkzeug.utils.redirect(request.httprequest.referrer + "#comments") - @http.route(['/shop/cart'], type='http', auth="public", website=True, multilang=True) + @http.route(['/shop/cart'], type='http', auth="public", website=True) def cart(self, **post): order = request.website.sale_get_order() values = { @@ -228,13 +228,13 @@ class website_sale(http.Controller): values['suggested_products'] = order._cart_accessories(context=request.context) return request.website.render("website_sale.cart", values) - @http.route(['/shop/cart/update'], type='http', auth="public", methods=['POST'], website=True, multilang=True) + @http.route(['/shop/cart/update'], type='http', auth="public", methods=['POST'], website=True) def cart_update(self, product_id, add_qty=1, set_qty=0, **kw): cr, uid, context = request.cr, request.uid, request.context request.website.sale_get_order(force_create=1)._cart_update(product_id=int(product_id), add_qty=add_qty, set_qty=set_qty) return request.redirect("/shop/cart") - @http.route(['/shop/cart/update_json'], type='json', auth="public", methods=['POST'], website=True, multilang=True) + @http.route(['/shop/cart/update_json'], type='json', auth="public", methods=['POST'], website=True) def cart_update_json(self, product_id, line_id, add_qty=None, set_qty=None): order = request.website.sale_get_order(force_create=1) quantity = order._cart_update(product_id=product_id, line_id=line_id, add_qty=add_qty, set_qty=set_qty) @@ -408,7 +408,7 @@ class website_sale(http.Controller): order_obj.write(cr, SUPERUSER_ID, [order.id], order_info, context=context) - @http.route(['/shop/checkout'], type='http', auth="public", website=True, multilang=True) + @http.route(['/shop/checkout'], type='http', auth="public", website=True) def checkout(self, **post): cr, uid, context, registry = request.cr, request.uid, request.context, request.registry @@ -422,7 +422,7 @@ class website_sale(http.Controller): return request.website.render("website_sale.checkout", values) - @http.route(['/shop/confirm_order'], type='http', auth="public", website=True, multilang=True) + @http.route(['/shop/confirm_order'], type='http', auth="public", website=True) def confirm_order(self, **post): cr, uid, context, registry = request.cr, request.uid, request.context, request.registry @@ -449,7 +449,7 @@ class website_sale(http.Controller): # Payment #------------------------------------------------------ - @http.route(['/shop/payment'], type='http', auth="public", website=True, multilang=True) + @http.route(['/shop/payment'], type='http', auth="public", website=True) def payment(self, **post): """ Payment step. This page proposes several payment means based on available payment.acquirer. State at this point : @@ -548,7 +548,7 @@ class website_sale(http.Controller): acquirer_total_url = '%s?%s' % (acquirer_form_post_url, werkzeug.url_encode(post)) return request.redirect(acquirer_total_url) - @http.route('/shop/payment/get_status/', type='json', auth="public", website=True, multilang=True) + @http.route('/shop/payment/get_status/', type='json', auth="public", website=True) def payment_get_status(self, sale_order_id, **post): cr, uid, context = request.cr, request.uid, request.context @@ -597,7 +597,7 @@ class website_sale(http.Controller): 'validation': validation } - @http.route('/shop/payment/validate', type='http', auth="public", website=True, multilang=True) + @http.route('/shop/payment/validate', type='http', auth="public", website=True) 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 : @@ -639,7 +639,7 @@ class website_sale(http.Controller): return request.redirect('/shop/confirmation') - @http.route(['/shop/confirmation'], type='http', auth="public", website=True, multilang=True) + @http.route(['/shop/confirmation'], type='http', auth="public", website=True) def payment_confirmation(self, **post): """ End of checkout process controller. Confirmation is basically seing the status of a sale.order. State at this point : @@ -662,7 +662,7 @@ class website_sale(http.Controller): # Edit #------------------------------------------------------ - @http.route(['/shop/add_product'], type='http', auth="user", methods=['POST'], website=True, multilang=True) + @http.route(['/shop/add_product'], type='http', auth="user", methods=['POST'], website=True) def add_product(self, name=None, category=0, **post): cr, uid, context, pool = request.cr, request.uid, request.context, request.registry if not name: diff --git a/addons/website_sale_delivery/controllers/main.py b/addons/website_sale_delivery/controllers/main.py index 5f3a8f5512e..9204a8b9655 100644 --- a/addons/website_sale_delivery/controllers/main.py +++ b/addons/website_sale_delivery/controllers/main.py @@ -6,7 +6,7 @@ from openerp import SUPERUSER_ID class website_sale(openerp.addons.website_sale.controllers.main.website_sale): - @http.route(['/shop/payment'], type='http', auth="public", website=True, multilang=True) + @http.route(['/shop/payment'], type='http', auth="public", website=True) def payment(self, **post): cr, uid, context = request.cr, request.uid, request.context order = self.get_order()