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

[FIX] website: display or not editor edit button; website_sale: test tour; website: contact qweb widget 

bzr revid: chm@openerp.com-20140121123912-0ya4ziusj09efti3
This commit is contained in:
Christophe Matthieu 2014-01-21 13:39:12 +01:00
parent 51f6977f39
commit 4ff1af4d01
16 changed files with 36 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
addons/website/models/ir_qweb.py
View File

@ -404,11 +404,7 @@ class Contact(orm.AbstractModel):
field_browse = self.pool[column._obj].browse(cr, openerp.SUPERUSER_ID, id, context={"show_address": True})
value = werkzeug.utils.escape( field_browse.name_get()[0][1] )
IMD = self.pool["ir.model.data"]
model, id = IMD.get_object_reference(cr, uid, "website", "contact")
view = self.pool["ir.ui.view"].browse(cr, uid, id, context=context)
html = view.render({
val = {
'name': value.split("\n")[0],
'address': werkzeug.utils.escape("\n".join(value.split("\n")[1:])),
'phone': field_browse.phone,
@ -417,7 +413,9 @@ class Contact(orm.AbstractModel):
'email': field_browse.email,
'fields': opf,
'options': options
}, engine='website.qweb', context=context)
}
html = self.pool["ir.ui.view"].render(cr, uid, "website.contact", val, engine='website.qweb', context=context)
return ir_qweb.HTMLSafe(html)

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

@ -463,6 +463,10 @@
$(window).on('resize', _.debounce(this.check_height.bind(this), 50));
this.check_height();
if (website.is_editable_button) {
this.$("button[data-action=edit]").removeClass("hidden");
}
return $.when(
this._super.apply(this, arguments),
this.rte.appendTo(this.$('#website-top-edit .nav.pull-right'))

3
addons/website/static/src/js/website.editor.newpage.js
View File

@ -3,11 +3,12 @@
var website = openerp.website;
website.is_editable = true;
website.is_editable_button = true;
website.EditorBar.include({
start: function() {
var res = this._super();
this.$("a[data-action=new_page]").parents("li").removeClass("hidden");
this.$("button[data-action=edit]").removeClass("hidden");
this.$(".oe_content_menu li.divider").removeClass("hidden");
return res;
},

1
addons/website/static/src/js/website.js
View File

@ -67,6 +67,7 @@
var dom_ready = website.dom_ready = $.Deferred();
$(document).ready(function () {
website.is_editable = website.is_editable || $('html').data('editable');
website.is_editable_button= website.is_editable_button || $('html').data('editable');
dom_ready.resolve();
});

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

@ -76,6 +76,9 @@
hack_to_add_snippet_id();
});
// 'snippet-dropped' is triggered on '#oe_snippets' whith $target as attribute when a snippet is dropped
// 'snippet-activated' is triggered on '#oe_snippets' (and on snippet) when a snippet is activated
website.snippet.styles = {};
website.snippet.selector = [];
website.snippet.BuildingBlock = openerp.Widget.extend({

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

@ -366,7 +366,7 @@
overlapsCrash = setTimeout(function () {
window.localStorage.removeItem(testId);
throw "Test: '" + testId + "' can't resolve stape: '" + step.stepId + "'";
}, step.delay || defaultDelay);
}, (step.delay || defaultDelay) + 500);
var $element = $(step.element);
if (step.triggers) step.triggers(next);

8
addons/website/static/src/js/website.translator.js
View File

@ -13,9 +13,13 @@
var self = this;
this.initial_content = {};
return this._super.apply(this, arguments).then(function () {
self.$("button[data-action=edit]").removeClass("hidden");
self.$('button[data-action=edit]')
.text("Translate")
.after(openerp.qweb.render('website.TranslatorAdditionalButtons'));
.text("Translate");
if (website.is_editable_button) {
self.$('button[data-action=edit]')
.after(openerp.qweb.render('website.TranslatorAdditionalButtons'));
}
self.$('.js_hide_on_translate').hide();
});
},

8
addons/website/views/website_templates.xml
View File

@ -239,10 +239,10 @@
</xpath>
</template>
<template id="show_sign_in" inherit_option_id="website.layout" inherit_id="website.layout" name="Show Sign In">
<template id="show_sign_in" inherit_option_id="website.layout" inherit_id="website.layout" name="Show Sign In" groups="base.group_public">
<xpath expr="//ul[@id='top_menu']" position="inside">
<li class="divider" groups="base.group_public"/>
<li groups="base.group_public">
<li class="divider"/>
<li>
<a t-attf-href="/web#redirect=#{ quote_plus(url_for('', keep_query='*')) }">
<b>Sign in</b>
</a>
@ -725,7 +725,7 @@ Sitemap: <t t-esc="url_root"/>sitemap.xml
<template id="contact">
<address t-ignore="true">
<div t-att-class='"" if "name" in fields else "css_non_editable_mode_hidden"'><span t-esc="name"/></div>
<div t-attf-class="'name' not in fields and 'css_non_editable_mode_hidden'"><span t-esc="name"/></div>
<div class='css_editable_mode_hidden'>
<div t-if="address and 'address' in fields">
<i class='fa fa-map-marker'/>

4
addons/website_blog/static/src/js/website_blog.editor.js
View File

@ -7,10 +7,8 @@
website.is_editable = true;
website.EditorBar.include({
start: function() {
website.is_editable_button = website.is_editable_button || !!$("#wrap.js_blog").size();
var res = this._super();
if ($("#wrap.js_blog").size()) {
this.$("button[data-action=edit]").removeClass("hidden");
}
this.$(".dropdown:has(.oe_content_menu)").removeClass("hidden");
return res;
},

4
addons/website_event/static/src/js/website_event.editor.js
View File

@ -7,10 +7,8 @@
website.is_editable = true;
website.EditorBar.include({
start: function() {
website.is_editable_button = website.is_editable_button || !!$("#wrap.js_event").size();
var res = this._super();
if ($("#wrap.js_event").size()) {
this.$("button[data-action=edit]").removeClass("hidden");
}
this.$(".dropdown:has(.oe_content_menu)").removeClass("hidden");
return res;
},

2
addons/website_event/views/website_event.xml
View File

@ -203,7 +203,7 @@
</t>
</ol>
</div>
<div class="col-sm-5">
<div class="col-sm-5" groups="event.group_event_manager">
<t t-call="website.publish_management">
<t t-set="object" t-value="event"/>
<t t-set="publish_edit" t-value="True"/>

4
addons/website_hr_recruitment/static/src/js/website_hr_recruitment.editor.js
View File

@ -6,10 +6,8 @@
website.is_editable = true;
website.EditorBar.include({
start: function() {
website.is_editable_button = website.is_editable_button || !!$("#wrap.js_hr_recruitment").size();
var res = this._super();
if ($("#wrap.js_hr_recruitment").size()) {
this.$("button[data-action=edit]").removeClass("hidden");
}
this.$(".dropdown:has(.oe_content_menu)").removeClass("hidden");
return res;
},

5
addons/website_sale/static/src/js/website.tour.shop.js
View File

@ -288,8 +288,9 @@
{
stepId: 'pay-checkout-product',
element: 'button:contains("Pay Now")',
trigger: 'click',
trigger: {
url: /shop\/confirmation\//,
},
},
{
stepId: 'end-test',

4
addons/website_sale/static/src/js/website_sale.editor.js
View File

@ -7,10 +7,8 @@
website.is_editable = true;
website.EditorBar.include({
start: function() {
website.is_editable_button = website.is_editable_button || !!$("#wrap.js_sale").size();
var res = this._super();
if ($("#wrap.js_sale").size()) {
this.$("button[data-action=edit]").removeClass("hidden");
}
this.$(".dropdown:has(.oe_content_menu)").removeClass("hidden");
return res;
},

11
addons/website_sale/tests/ui_suite/website_sale-sale_process-test.js
View File

@ -15,16 +15,9 @@ testRunner.run(function websiteSaleTest (page, timeout) {
window.openerp.website.TestConsole.test('shoptest').run(true);
});
waitFor(function testExecuted () {
var after = page.evaluate(function () {
return window.$ && $('button[data-action=edit]').is(":visible") && {
image: $('#wrap [data-snippet-id=image-text]').length,
text: $('#wrap [data-snippet-id=text-block]').length,
};
});
var result = after && (after.image === 1) && (after.text === 1);
return result;
return page.evaluate(function () { return window.$ && $('#wrap:contains("Order Confirmed")').length; });
}, function finish () {
console.log('{ "event": "success" }');
console.log('{ "website_sale": "success" }');
phantom.exit();
}, 4*timeout/5);
}, timeout/5);

2
addons/website_sale/views/website_sale.xml
View File

@ -282,7 +282,7 @@
<t t-call="website_sale.search" />
</form>
</div>
<div class="col-sm-4">
<div class="col-sm-4" groups="base.group_sale_manager">
<t t-call="website.publish_management">
<t t-set="object" t-value="product"/>
<t t-set="publish_edit" t-value="True"/>