odoo
/
odoo
2
0
Fork 0
Code Pull Requests Releases Activity

Merge branch '8.0' of github.com:odoo/odoo into 8.0

This commit is contained in:
Fabien Pinckaers 2014-08-20 19:38:59 +02:00
parent 76a84ce2bf c48a7141e6
commit fee5701359
4 changed files with 36 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
addons/web/static/src/js/tour.js
View File

@ -323,7 +323,7 @@ var Tour = {
},
log: function (message, add_user) {
if (add_user) {
var user = $(".navbar .dropdown:has(>.js_usermenu) a:first, .navbar .oe_topbar_name").text();
var user = $(".navbar .dropdown:has(>.js_usermenu) a:first, .navbar .oe_topbar_name, .pos .username").text();
if (!user && $('a[href*="/login"]')) user = 'Public User';
message += " (" + (user||"").replace(/^\s*|\s*$/g, '') + ")";
}

16
addons/website/models/website.py
View File

@ -220,7 +220,10 @@ class website(osv.osv):
def page_exists(self, cr, uid, ids, name, module='website', context=None):
try:
return self.pool["ir.model.data"].get_object_reference(cr, uid, module, name)
name = (name or "").replace("/page/website.", "").replace("/page/", "")
if not name:
return False
return self.pool["ir.model.data"].get_object_reference(cr, uid, module, name)
except:
return False
@ -394,9 +397,14 @@ class website(osv.osv):
yield page
def search_pages(self, cr, uid, ids, needle=None, limit=None, context=None):
return list(itertools.islice(
self.enumerate_pages(cr, uid, ids, query_string=needle, context=context),
limit))
name = (needle or "").replace("/page/website.", "").replace("/page/", "")
res = []
for page in self.enumerate_pages(cr, uid, ids, query_string=name, context=context):
if needle in page['loc']:
res.append(page)
if len(res) == limit:
break
return res
def kanban(self, cr, uid, ids, model, domain, column, template, step=None, scope=None, orderby=None, context=None):
step = step and int(step) or 10

20
addons/website/static/src/js/website.editor.js
View File

@ -1046,6 +1046,7 @@
make_link: function (url, new_window, label, classes) {
},
bind_data: function () {
var self = this;
var href = this.element && (this.element.data( 'cke-saved-href')
|| this.element.getAttribute('href'));
var new_window = this.element
@ -1053,8 +1054,13 @@
: false;
var text = this.element ? this.element.getText() : '';
if (!text.length) {
var selection = this.editor.getSelection();
text = selection.getSelectedText();
if (this.editor) {
text = this.editor.getSelection().getSelectedText();
} else {
text = this.data.name;
href = this.data.url;
new_window = this.data.new_window;
}
}
this.$('input#link-text').val(text);
@ -1075,8 +1081,14 @@
this.$('input.email-address').val(match[1]).change();
}
if (href && !$control) {
this.$('input.url').val(href).change();
this.$('input.window-new').closest("div").show();
this.page_exists(href).then(function (exist) {
if (exist) {
self.$('#link-page').select2('data', {'id': href, 'text': href});
} else {
self.$('input.url').val(href).change();
self.$('input.window-new').closest("div").show();
}
});
}
this.preview();
},

10
addons/website/static/src/js/website.snippets.editor.js
View File

@ -321,13 +321,14 @@
var self = this;
var snipped_event_flag;
$("#wrapwrap").on('click', function (event) {
if (snipped_event_flag || !event.srcElement) {
var srcElement = event.srcElement || (event.originalEvent && (event.originalEvent.originalTarget || event.originalEvent.target));
if (snipped_event_flag || !srcElement) {
return;
}
snipped_event_flag = true;
setTimeout(function () {snipped_event_flag = false;}, 0);
var $target = $(event.srcElement);
var $target = $(srcElement);
if ($target.parents(".oe_overlay").length) {
return;
@ -740,7 +741,7 @@
var styles = this.$target.data("snippet-option-ids") || {};
styles[snippet_id] = this;
this.$target.data("snippet-option-ids", styles);
this.$overlay = this.$target.data('overlay');
this.$overlay = this.$target.data('overlay') || $('<div>');
this['snippet-option-id'] = snippet_id;
var $option = website.snippet.templateOptions[snippet_id].$el;
this.$el = $option.find(">li").clone();
@ -1537,6 +1538,9 @@
new website.editor.MediaDialog(self, self.element).appendTo(document.body);
self.BuildingBlock.make_active(false);
}
setTimeout(function () {
self.$target.find(".css_editable_mode_display").removeAttr("_moz_abspos");
},0);
},
});