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

[FIX] matching of site page URLs

Browse Source 
With page urls not necessarily being full xmlids, match to result of
list_pages needs to take that in account to correctly infer a url is a
site page's.

bzr revid: xmo@openerp.com-20130923110618-ckicw4a5bpvatzie
This commit is contained in:
Xavier Morel
2013-09-23 13:06:18 +02:00
parent 3e336cda54
commit be4b1b9b59
2 changed files with 9 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
addons/website/controllers/main.py
+1 -1
View File
@@ -64,7 +64,7 @@ class Website(openerp.addons.web.controllers.main.Home):
request.cr, request.uid, newview_id, context=request.context)
newview.write({
'arch': newview.arch.replace("website.default_page", xid),
'name': "page/%s" % xid,
'name': "page/%s" % path,
'page': True,
})
# Fuck it, we're doing it live
addons/website/static/src/js/website.editor.js
+8 -3
View File
@@ -604,10 +604,15 @@
if (!href) { return; }
var match, $control;
if (match = /(mailto):(.+)/.exec(href)) {
$control = this.$('input.email-address').val(match[2]);
} else if(href in this.pages) {
if (match = /mailto:(.+)/.exec(href)) {
$control = this.$('input.email-address').val(match[1]);
} else if (href in this.pages) {
$control = this.$('select.existing').val(href);
} else if (match = /\/page\/(.+)/.exec(href)) {
var actual_href = '/page/website.' + match[1];
if (actual_href in this.pages) {
$control = this.$('select.existing').val(actual_href);
}
}
if (!$control) {
$control = this.$('input.url').val(href);