pengyuthon/odoo_source
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[IMP] website(_*): add kwargs in routes where necessary

Browse Source 
task-32836
This commit is contained in:
Romain Derie
2018-09-25 19:16:10 +02:00
parent d3530eb07e
commit 4daceeddb2
5 changed files with 14 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
addons/website/controllers/main.py
+5 -5
View File
@@ -121,7 +121,7 @@ class Website(Home):
return dict(fields=fields, states=[(st.id, st.name, st.code) for st in country.state_ids], phone_code=country.phone_code)
@http.route(['/robots.txt'], type='http', auth="public")
def robots(self):
def robots(self, **kwargs):
return request.render('website.robots', {'url_root': request.httprequest.url_root}, mimetype='text/plain')
@http.route('/sitemap.xml', type='http', auth="public", website=True, multilang=False)
@@ -193,7 +193,7 @@ class Website(Home):
return request.make_response(content, [('Content-Type', mimetype)])
@http.route('/website/info', type='http', auth="public", website=True)
def website_info(self):
def website_info(self, **kwargs):
try:
request.website.get_template('website.website_info').name
except Exception as e:
@@ -256,7 +256,7 @@ class Website(Home):
return request.render("website.list_website_pages", values)
@http.route(['/website/add/', '/website/add/<path:path>'], type='http', auth="user", website=True)
def pagenew(self, path="", noredirect=False, add_menu=False, template=False):
def pagenew(self, path="", noredirect=False, add_menu=False, template=False, **kwargs):
# for supported mimetype, get correct default template
_, ext = os.path.splitext(path)
ext_special_case = ext and ext in _guess_mimetype() and ext != '.html'
@@ -286,7 +286,7 @@ class Website(Home):
return views.read(['name', 'id', 'key', 'xml_id', 'arch', 'active', 'inherit_id'])
@http.route('/website/reset_templates', type='http', auth='user', methods=['POST'], website=True)
def reset_template(self, templates, redirect='/'):
def reset_template(self, templates, redirect='/', **kwargs):
templates = request.httprequest.form.getlist('templates')
modules_to_update = []
for temp_id in templates:
@@ -383,7 +383,7 @@ class Website(Home):
return True
@http.route(['/website/theme_customize_reload'], type='http', auth="public", website=True)
def theme_customize_reload(self, href, enable, disable, tab=0):
def theme_customize_reload(self, href, enable, disable, tab=0, **kwargs):
self.theme_customize(enable and enable.split(",") or [], disable and disable.split(",") or [])
return request.redirect(href + ("&theme=true" if "#" in href else "#theme=true") + ("&tab=" + tab))
addons/website_blog/controllers/main.py
+1 -1
View File
@@ -177,7 +177,7 @@ class WebsiteBlog(http.Controller):
return response
@http.route(['''/blog/<model("blog.blog", "[('website_id', 'in', (False, current_website_id))]"):blog>/feed'''], type='http', auth="public")
def blog_feed(self, blog, limit='15'):
def blog_feed(self, blog, limit='15', **kwargs):
v = {}
v['blog'] = blog
v['base_url'] = request.env['ir.config_parameter'].sudo().get_param('web.base.url')
addons/website_forum/controllers/main.py
+6 -6
View File
@@ -455,7 +455,7 @@ class WebsiteForum(http.Controller):
# --------------------------------------------------
@http.route('/forum/<model("forum.forum"):forum>/validation_queue', type='http', auth="user", website=True)
def validation_queue(self, forum):
def validation_queue(self, forum, **kwargs):
user = request.env.user
if user.karma < forum.karma_moderate:
raise werkzeug.exceptions.NotFound()
@@ -473,7 +473,7 @@ class WebsiteForum(http.Controller):
return request.render("website_forum.moderation_queue", values)
@http.route('/forum/<model("forum.forum"):forum>/flagged_queue', type='http', auth="user", website=True)
def flagged_queue(self, forum):
def flagged_queue(self, forum, **kwargs):
user = request.env.user
if user.karma < forum.karma_moderate:
raise werkzeug.exceptions.NotFound()
@@ -491,7 +491,7 @@ class WebsiteForum(http.Controller):
return request.render("website_forum.moderation_queue", values)
@http.route('/forum/<model("forum.forum"):forum>/offensive_posts', type='http', auth="user", website=True)
def offensive_posts(self, forum):
def offensive_posts(self, forum, **kwargs):
user = request.env.user
if user.karma < forum.karma_moderate:
raise werkzeug.exceptions.NotFound()
@@ -509,7 +509,7 @@ class WebsiteForum(http.Controller):
return request.render("website_forum.moderation_queue", values)
@http.route('/forum/<model("forum.forum"):forum>/post/<model("forum.post"):post>/validate', type='http', auth="user", website=True)
def post_accept(self, forum, post):
def post_accept(self, forum, post, **kwargs):
url = "/forum/%s/validation_queue" % (slug(forum))
if post.state == 'flagged':
url = "/forum/%s/flagged_queue" % (slug(forum))
@@ -519,7 +519,7 @@ class WebsiteForum(http.Controller):
return werkzeug.utils.redirect(url)
@http.route('/forum/<model("forum.forum"):forum>/post/<model("forum.post"):post>/refuse', type='http', auth="user", website=True)
def post_refuse(self, forum, post):
def post_refuse(self, forum, post, **kwargs):
post.refuse()
return self.question_ask_for_close(forum, post)
@@ -530,7 +530,7 @@ class WebsiteForum(http.Controller):
return post.flag()[0]
@http.route('/forum/<model("forum.forum"):forum>/post/<model("forum.post"):post>/ask_for_mark_as_offensive', type='http', auth="user", methods=['GET'], website=True)
def post_ask_for_mark_as_offensive(self, forum, post):
def post_ask_for_mark_as_offensive(self, forum, post, **kwargs):
offensive_reasons = request.env['forum.post.reason'].search([('reason_type', '=', 'offensive')])
values = self._prepare_forum_values(forum=forum)
addons/website_sale/controllers/main.py
+1 -1
View File
@@ -960,7 +960,7 @@ class WebsiteSale(ProductConfiguratorController):
return request.redirect('/shop')
@http.route(['/shop/print'], type='http', auth="public", website=True)
def print_saleorder(self):
def print_saleorder(self, **kwargs):
sale_order_id = request.session.get('sale_last_order_id')
if sale_order_id:
pdf, _ = request.env.ref('sale.action_report_saleorder').sudo().render_qweb_pdf([sale_order_id])
addons/website_slides/controllers/main.py
+1 -1
View File
@@ -203,7 +203,7 @@ class WebsiteSlides(http.Controller):
return request.render("website.403")
@http.route('''/slides/slide/<model("slide.slide"):slide>/promote''', type='http', auth='user', website=True)
def slide_set_promoted(self, slide):
def slide_set_promoted(self, slide, **kwargs):
slide.channel_id.promoted_slide_id = slide.id
return request.redirect("/slides/%s" % slide.channel_id.id)