From 7027ce6eda8f38468fc795a7366ffce4672703f3 Mon Sep 17 00:00:00 2001 From: jke-openerp Date: Thu, 30 Jan 2014 10:18:13 +0100 Subject: [PATCH 01/55] [REF] website_sale : Add missing widget option in recommanded product, to display image bzr revid: jke@openerp.com-20140130091813-hko16qlm4t8tmq37 --- addons/website_sale/views/website_sale.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/addons/website_sale/views/website_sale.xml b/addons/website_sale/views/website_sale.xml index 6717bc62557..9bb0a288320 100644 --- a/addons/website_sale/views/website_sale.xml +++ b/addons/website_sale/views/website_sale.xml @@ -358,7 +358,7 @@
- +
From e974e1fbead436e5b77df428f5117af3688d8893 Mon Sep 17 00:00:00 2001 From: Fabien Meghazi Date: Thu, 30 Jan 2014 10:23:08 +0100 Subject: [PATCH 02/55] [REM] remove disable_db and ensure_db() from addons bzr revid: fme@openerp.com-20140130092308-s24a7h2mhzuaasf1 --- addons/auth_oauth/controllers/main.py | 2 -- addons/auth_signup/controllers/main.py | 2 -- addons/mass_mailing/controllers/main.py | 1 - addons/payment_adyen/controllers/main.py | 1 - addons/payment_ogone/controllers/main.py | 1 - addons/payment_paypal/controllers/main.py | 3 --- addons/payment_transfer/controllers/main.py | 1 - 7 files changed, 11 deletions(-) diff --git a/addons/auth_oauth/controllers/main.py b/addons/auth_oauth/controllers/main.py index e932b6ca1c0..e660fd8363b 100644 --- a/addons/auth_oauth/controllers/main.py +++ b/addons/auth_oauth/controllers/main.py @@ -68,8 +68,6 @@ class OAuthLogin(openerp.addons.web.controllers.main.Home): @http.route() def web_login(self, *args, **kw): - http.ensure_db(with_registry=True) - request.disable_db = False providers = self.list_providers() response = super(OAuthLogin, self).web_login(*args, **kw) diff --git a/addons/auth_signup/controllers/main.py b/addons/auth_signup/controllers/main.py index 7a517a0ef8c..2db1e3dff65 100644 --- a/addons/auth_signup/controllers/main.py +++ b/addons/auth_signup/controllers/main.py @@ -34,8 +34,6 @@ class Home(openerp.addons.web.controllers.main.Home): @http.route() def web_login(self, *args, **kw): - http.ensure_db(with_registry=True) - mode = request.params.get('mode') qcontext = request.params.copy() response = webmain.render_bootstrap_template(request.session.db, 'auth_signup.signup', qcontext, lazy=True) diff --git a/addons/mass_mailing/controllers/main.py b/addons/mass_mailing/controllers/main.py index 9f5f88327e9..046084621c7 100644 --- a/addons/mass_mailing/controllers/main.py +++ b/addons/mass_mailing/controllers/main.py @@ -6,7 +6,6 @@ class MassMailController(http.Controller): @http.route('/mail/track//blank.gif', type='http', auth='none') def track_mail_open(self, mail_id): """ Email tracking. """ - request.disable_db = False mail_mail_stats = request.registry.get('mail.mail.statistics') mail_mail_stats.set_opened(request.cr, SUPERUSER_ID, mail_mail_ids=[mail_id]) return "data:image/gif;base64,R0lGODlhAQABAIAAANvf7wAAACH5BAEAAAAALAAAAAABAAEAAAICRAEAOw==" diff --git a/addons/payment_adyen/controllers/main.py b/addons/payment_adyen/controllers/main.py index ad5a68d2327..e6e74eba9a7 100644 --- a/addons/payment_adyen/controllers/main.py +++ b/addons/payment_adyen/controllers/main.py @@ -22,7 +22,6 @@ class AdyenController(http.Controller): ], type='http', auth='none') def adyen_return(self, pspReference, **post): """ Paypal IPN.""" - request.disable_db = False post["pspReference"] = pspReference _logger.info('Beginning Adyen form_feedback with post data %s', pprint.pformat(post)) # debug request.registry['payment.transaction'].form_feedback(request.cr, SUPERUSER_ID, post, 'adyen', context=request.context) diff --git a/addons/payment_ogone/controllers/main.py b/addons/payment_ogone/controllers/main.py index 6ffc0661767..f93c913ed1d 100644 --- a/addons/payment_ogone/controllers/main.py +++ b/addons/payment_ogone/controllers/main.py @@ -23,7 +23,6 @@ class OgoneController(http.Controller): ], type='http', auth='none') def ogone_form_feedback(self, **post): """ Ogone contacts using GET, at least for accept """ - request.disable_db = False _logger.info('Ogone: entering form_feedback with post data %s', pprint.pformat(post)) # debug cr, uid, context = request.cr, SUPERUSER_ID, request.context request.registry['payment.transaction'].form_feedback(cr, uid, post, 'ogone', context=context) diff --git a/addons/payment_paypal/controllers/main.py b/addons/payment_paypal/controllers/main.py index ce43314498f..967059e59ae 100644 --- a/addons/payment_paypal/controllers/main.py +++ b/addons/payment_paypal/controllers/main.py @@ -56,7 +56,6 @@ class PaypalController(http.Controller): @http.route('/payment/paypal/ipn/', type='http', auth='none', methods=['POST']) def paypal_ipn(self, **post): """ Paypal IPN. """ - request.disable_db = False _logger.info('Beginning Paypal IPN form_feedback with post data %s', pprint.pformat(post)) # debug self.paypal_validate_data(**post) return '' @@ -64,7 +63,6 @@ class PaypalController(http.Controller): @http.route('/payment/paypal/dpn', type='http', auth="none", methods=['POST']) def paypal_dpn(self, **post): """ Paypal DPN """ - request.disable_db = False _logger.info('Beginning Paypal DPN form_feedback with post data %s', pprint.pformat(post)) # debug return_url = self._get_return_url(**post) self.paypal_validate_data(**post) @@ -73,7 +71,6 @@ class PaypalController(http.Controller): @http.route('/payment/paypal/cancel', type='http', auth="none") def paypal_cancel(self, **post): """ When the user cancels its Paypal payment: GET on this route """ - request.disable_db = False cr, uid, context = request.cr, SUPERUSER_ID, request.context _logger.info('Beginning Paypal cancel with post data %s', pprint.pformat(post)) # debug return_url = self._get_return_url(**post) diff --git a/addons/payment_transfer/controllers/main.py b/addons/payment_transfer/controllers/main.py index 9f5152e442a..917ac63cc81 100644 --- a/addons/payment_transfer/controllers/main.py +++ b/addons/payment_transfer/controllers/main.py @@ -16,7 +16,6 @@ class OgoneController(http.Controller): '/payment/transfer/feedback', ], type='http', auth='none') def transfer_form_feedback(self, **post): - request.disable_db = False cr, uid, context = request.cr, SUPERUSER_ID, request.context _logger.info('Beginning form_feedback with post data %s', pprint.pformat(post)) # debug request.registry['payment.transaction'].form_feedback(cr, uid, post, 'transfer', context) From ab8ee396ec9957b4129791167d158ad3a44ed5bd Mon Sep 17 00:00:00 2001 From: jke-openerp Date: Thu, 30 Jan 2014 10:49:27 +0100 Subject: [PATCH 03/55] [TYPO] Add space between icon and button in cart "Continue Shopping" bzr revid: jke@openerp.com-20140130094927-44b8szwtb602e180 --- addons/website_sale/views/website_sale.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/addons/website_sale/views/website_sale.xml b/addons/website_sale/views/website_sale.xml index 9bb0a288320..695c8563ce7 100644 --- a/addons/website_sale/views/website_sale.xml +++ b/addons/website_sale/views/website_sale.xml @@ -553,7 +553,7 @@ From 8cf2adf5e314203debbec78edd7b163b40248348 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20van=20der=20Essen?= Date: Thu, 30 Jan 2014 11:30:51 +0100 Subject: [PATCH 04/55] [IMP] point_of_sale: hold receipts until the printer is back online bzr revid: fva@openerp.com-20140130103051-htsx7ts111axhhub --- addons/point_of_sale/static/src/js/devices.js | 27 ++++++++++++++++++- 1 file changed, 26 insertions(+), 1 deletion(-) diff --git a/addons/point_of_sale/static/src/js/devices.js b/addons/point_of_sale/static/src/js/devices.js index 57b23afd49f..bb13503d903 100644 --- a/addons/point_of_sale/static/src/js/devices.js +++ b/addons/point_of_sale/static/src/js/devices.js @@ -102,6 +102,8 @@ function openerp_pos_devices(instance,module){ //module is instance.point_of_sal }; this.custom_payment_status = this.default_payment_status; + this.receipt_queue = []; + this.notifications = {}; this.bypass_proxy = false; @@ -113,6 +115,13 @@ function openerp_pos_devices(instance,module){ //module is instance.point_of_sal this.set_connection_status('disconnected'); + this.on('change:status',this,function(eh,status){ + status = status.newValue; + if(status.status === 'connected'){ + self.print_receipt(); + } + }); + window.hw_proxy = this; }, set_connection_status: function(status,drivers){ @@ -502,7 +511,23 @@ function openerp_pos_devices(instance,module){ //module is instance.point_of_sal * } */ print_receipt: function(receipt){ - return this.message('print_receipt',{receipt: receipt}); + var self = this; + if(receipt){ + this.receipt_queue.push(receipt); + } + var aborted = false; + function send_printing_job(){ + if (self.receipt_queue.length > 0){ + var r = self.receipt_queue.shift(); + self.message('print_receipt',{ receipt: r },{ timeout: 5000 }) + .then(function(){ + send_printing_job(); + },function(){ + self.receipt_queue.unshift(r) + }); + } + } + send_printing_job(); }, // asks the proxy to log some information, as with the debug.log you can provide several arguments. From fd6d4d8303563948cfdbde620f5ffdb06c6fa5c1 Mon Sep 17 00:00:00 2001 From: jke-openerp Date: Thu, 30 Jan 2014 11:49:37 +0100 Subject: [PATCH 05/55] [FIX] Set the good url redirect in "Sign In" button from the cart bzr revid: jke@openerp.com-20140130104937-6rjt51rg3o9bz90k --- addons/website_sale/views/website_sale.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/addons/website_sale/views/website_sale.xml b/addons/website_sale/views/website_sale.xml index 695c8563ce7..c45861f9382 100644 --- a/addons/website_sale/views/website_sale.xml +++ b/addons/website_sale/views/website_sale.xml @@ -720,7 +720,7 @@

Billing Information or - sign in + Sign in

From c38e65d343f3ae3f8dfaf92d49d61adcd940418b Mon Sep 17 00:00:00 2001 From: jke-openerp Date: Thu, 30 Jan 2014 12:10:56 +0100 Subject: [PATCH 06/55] [FIx] Convert # to %23 in url for twitter bzr revid: jke@openerp.com-20140130111056-gf31rpb8wknyxm8d --- addons/website_event/views/website_event.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/addons/website_event/views/website_event.xml b/addons/website_event/views/website_event.xml index 34c515e3843..bb536795adc 100644 --- a/addons/website_event/views/website_event.xml +++ b/addons/website_event/views/website_event.xml @@ -337,7 +337,7 @@ and join the conversation.

Use this tag: - # + #

From 516a85cecc3a77b409179dde68f4f37234dd1775 Mon Sep 17 00:00:00 2001 From: jke-openerp Date: Thu, 30 Jan 2014 12:13:49 +0100 Subject: [PATCH 07/55] [Fix] Use maps.google.com and not .be (as for thumbail who use the api .com). [IMP] Add zoom 10 by default [FIX] Escape False in address for google search bzr revid: jke@openerp.com-20140130111349-l90w9larrntv83hh --- addons/website/models/website.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/addons/website/models/website.py b/addons/website/models/website.py index e053863e557..87acdbbfbe5 100644 --- a/addons/website/models/website.py +++ b/addons/website/models/website.py @@ -605,9 +605,10 @@ class res_partner(osv.osv): def google_map_link(self, cr, uid, ids, zoom=8, context=None): partner = self.browse(cr, uid, ids[0], context=context) params = { - 'q': '%s, %s %s, %s' % (partner.street, partner.city, partner.zip, partner.country_id and partner.country_id.name_get()[0][1] or ''), + 'q': '%s, %s %s, %s' % (partner.street or '', partner.city or '', partner.zip or '', partner.country_id and partner.country_id.name_get()[0][1] or ''), + 'z': 10 } - return urlplus('https://maps.google.be/maps' , params) + return urlplus('https://maps.google.com/maps' , params) class res_company(osv.osv): _inherit = "res.company" From 18532330d4d0f3dab7401ad8d5628f28183e537d Mon Sep 17 00:00:00 2001 From: Denis Ledoux Date: Thu, 30 Jan 2014 12:24:08 +0100 Subject: [PATCH 08/55] [FIX] *: replace urllib calls by werkzeug calls, as werkzeug handles utf-8 encoding while urllib doesnt bzr revid: dle@openerp.com-20140130112408-8pdju26jnkyxvlw2 --- addons/auth_openid/controllers/main.py | 3 +-- addons/edi/controllers/main.py | 4 ++-- addons/share/wizard/share_wizard.py | 1 - addons/website/models/website.py | 14 ++------------ addons/website/tests/test_requests.py | 3 +-- addons/website_crm/controllers/main.py | 4 ++-- 6 files changed, 8 insertions(+), 21 deletions(-) diff --git a/addons/auth_openid/controllers/main.py b/addons/auth_openid/controllers/main.py index 534d1b01a9c..128be6f7dbe 100644 --- a/addons/auth_openid/controllers/main.py +++ b/addons/auth_openid/controllers/main.py @@ -23,7 +23,6 @@ import logging import os import tempfile import getpass -import urllib import werkzeug.urls import werkzeug.exceptions @@ -79,7 +78,7 @@ class GoogleAppsAwareConsumer(consumer.GenericConsumer): # update fields for attr in ['claimed_id', 'identity']: value = message.getArg(consumer.OPENID2_NS, attr, '') - value = 'https://www.google.com/accounts/o8/user-xrds?uri=%s' % urllib.quote_plus(value) + value = 'https://www.google.com/accounts/o8/user-xrds?uri=%s' % werkzeug.url_quote_plus(value) message.setArg(consumer.OPENID2_NS, attr, value) # now, resign the message diff --git a/addons/edi/controllers/main.py b/addons/edi/controllers/main.py index 86115d12d4b..d92cb2478cc 100644 --- a/addons/edi/controllers/main.py +++ b/addons/edi/controllers/main.py @@ -1,5 +1,5 @@ import simplejson -import urllib +import werkzeug.urls import openerp import openerp.addons.web.controllers.main as webmain @@ -17,7 +17,7 @@ class EDI(openerp.http.Controller): css = "\n ".join('' % i for i in webmain.manifest_list(req, modules_str, 'css')) # `url` may contain a full URL with a valid query string, we basically want to watch out for XML brackets and double-quotes - safe_url = urllib.quote_plus(url,':/?&;=') + safe_url = werkzeug.url_quote_plus(url,':/?&;=') return webmain.html_template % { 'js': js, diff --git a/addons/share/wizard/share_wizard.py b/addons/share/wizard/share_wizard.py index 2e8d4d9373e..22b880956cc 100644 --- a/addons/share/wizard/share_wizard.py +++ b/addons/share/wizard/share_wizard.py @@ -21,7 +21,6 @@ import logging import random import time -from urllib import quote_plus import uuid from openerp import SUPERUSER_ID diff --git a/addons/website/models/website.py b/addons/website/models/website.py index e053863e557..a0e6a458119 100644 --- a/addons/website/models/website.py +++ b/addons/website/models/website.py @@ -80,17 +80,7 @@ def slug(value): return "%s-%d" % (slugify(name), id) def urlplus(url, params): - if not params: - return url - - # can't use urlencode because it encodes to (ascii, replace) in p2 - return "%s?%s" % (url, '&'.join( - k + '=' + urllib.quote_plus(v.encode('utf-8') if isinstance(v, unicode) else str(v)) - for k, v in params.iteritems() - )) - -def quote_plus(value): - return urllib.quote_plus(value.encode('utf-8') if isinstance(value, unicode) else str(value)) + return werkzeug.Href(url)(params or None) class website(osv.osv): def _get_menu_website(self, cr, uid, ids, context=None): @@ -243,7 +233,7 @@ class website(osv.osv): slug=slug, res_company=request.website.company_id, user_id=user.browse(cr, uid, uid), - quote_plus=quote_plus, + quote_plus=werkzeug.url_quote_plus, ) qweb_values.setdefault('editable', False) diff --git a/addons/website/tests/test_requests.py b/addons/website/tests/test_requests.py index a60501a6513..ecdb8d99d7d 100644 --- a/addons/website/tests/test_requests.py +++ b/addons/website/tests/test_requests.py @@ -1,6 +1,5 @@ # -*- coding: utf-8 -*- import collections -import urllib import urlparse import unittest2 import urllib2 @@ -66,7 +65,7 @@ class CrawlSuite(unittest2.TestSuite): # blow up in multidb situations self.opener.open('http://localhost:{port}/web/?db={db}'.format( port=tools.config['xmlrpc_port'], - db=urllib.quote_plus(tools.config['db_name']), + db=werkzeug.url_quote_plus(tools.config['db_name']), )) if user is not None: url = 'http://localhost:{port}/login?{query}'.format( diff --git a/addons/website_crm/controllers/main.py b/addons/website_crm/controllers/main.py index 7f4443d26a4..85ffc950a3f 100644 --- a/addons/website_crm/controllers/main.py +++ b/addons/website_crm/controllers/main.py @@ -4,13 +4,13 @@ from openerp.addons.web import http from openerp.addons.web.http import request from openerp import SUPERUSER_ID -from urllib import quote_plus +import werkzeug.urls class contactus(http.Controller): def generate_google_map_url(self, street, city, city_zip, country_name): - url = "http://maps.googleapis.com/maps/api/staticmap?center=%s&sensor=false&zoom=8&size=298x298" % quote_plus( + url = "http://maps.googleapis.com/maps/api/staticmap?center=%s&sensor=false&zoom=8&size=298x298" % werkzeug.url_quote_plus( '%s, %s %s, %s' % (street, city, city_zip, country_name) ) return url From 20fc20a3f2ac2141643720160551af20d3949586 Mon Sep 17 00:00:00 2001 From: Antony Lesuisse Date: Thu, 30 Jan 2014 12:45:35 +0100 Subject: [PATCH 09/55] [IMP] http allow auth=none without db outside of web bzr revid: al@openerp.com-20140130114535-0keldqr1eln8swm8 --- openerp/http.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/openerp/http.py b/openerp/http.py index 7069cbdeefe..09a0a8d1d57 100644 --- a/openerp/http.py +++ b/openerp/http.py @@ -865,7 +865,7 @@ class Root(object): self.load_addons() _logger.info("Generating nondb routing") - self.nodb_routing_map = routing_map(['', "web"], True) + self.nodb_routing_map = routing_map([''] + openerp.conf.server_wide_modules, True) def __call__(self, environ, start_response): """ Handle a WSGI request From 9cce88ab6a399881b9d1774a717a030c7e575913 Mon Sep 17 00:00:00 2001 From: Fabien Meghazi Date: Thu, 30 Jan 2014 13:17:45 +0100 Subject: [PATCH 10/55] [ADD] Cross-Origin Resource Sharing support as http.route() argument bzr revid: fme@openerp.com-20140130121745-zjuuves1yhydydpx --- openerp/http.py | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/openerp/http.py b/openerp/http.py index 09a0a8d1d57..35cf8f39a7c 100644 --- a/openerp/http.py +++ b/openerp/http.py @@ -207,7 +207,7 @@ class WebRequest(object): warnings.warn('please use request.registry and request.cr directly', DeprecationWarning) yield (self.registry, self.cr) -def route(route, type="http", auth="user", methods=None): +def route(route, type="http", auth="user", methods=None, cors=None): """ Decorator marking the decorated method as being a handler for requests. The method must be part of a subclass of ``Controller``. @@ -225,6 +225,7 @@ def route(route, type="http", auth="user", methods=None): authentication modules. There request code will not have any facilities to access the database nor have any configuration indicating the current database nor the current user. :param methods: A sequence of http methods this route applies to. If not specified, all methods are allowed. + :param cors: The Access-Control-Allow-Origin cors directive value. """ assert type in ["http", "json"] def decorator(f): @@ -234,6 +235,7 @@ def route(route, type="http", auth="user", methods=None): f.routes = [route] f.methods = methods f.exposed = type + f.cors = cors if getattr(f, "auth", None) is None: f.auth = auth return f @@ -955,6 +957,12 @@ class Root(object): if not explicit_session and hasattr(response, 'set_cookie'): response.set_cookie('session_id', httprequest.session.sid, max_age=90 * 24 * 60 * 60) + # Support for Cross-Origin Resource Sharing + if request.func.cors: + response.headers.set('Access-Control-Allow-Origin', request.func.cors) + if request.func.methods: + response.headers.set('Access-Control-Allow-Methods', ','.join(request.func.methods)) + return response def dispatch(self, environ, start_response): From b3268a48c2f72fb055571425f719c9a43aaa51ac Mon Sep 17 00:00:00 2001 From: Denis Ledoux Date: Thu, 30 Jan 2014 13:20:51 +0100 Subject: [PATCH 11/55] [FIX] event: put back country_id related field as needed in event itself (not just website_event) bzr revid: dle@openerp.com-20140130122051-cm2u2hotlnfv4bxj --- addons/event/event.py | 2 ++ addons/website_event/models/event.py | 2 -- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/addons/event/event.py b/addons/event/event.py index 9574984ddd5..0b10b1e51ec 100644 --- a/addons/event/event.py +++ b/addons/event/event.py @@ -160,6 +160,8 @@ class event_event(osv.osv): 'email_confirmation_id' : fields.many2one('email.template','Event Confirmation Email', help="If you set an email template, each participant will receive this email announcing the confirmation of the event."), 'reply_to': fields.char('Reply-To Email', size=64, readonly=False, states={'done': [('readonly', True)]}, help="The email address of the organizer is likely to be put here, with the effect to be in the 'Reply-To' of the mails sent automatically at event or registrations confirmation. You can also put the email address of your mail gateway if you use one."), 'address_id': fields.many2one('res.partner','Location', readonly=False, states={'done': [('readonly', True)]}), + 'country_id': fields.related('address_id', 'country_id', + type='many2one', relation='res.country', string='Country', readonly=False, states={'done': [('readonly', True)]}, store=True), 'description': fields.html( 'Description', readonly=False, states={'done': [('readonly', True)]}, diff --git a/addons/website_event/models/event.py b/addons/website_event/models/event.py index 62a50ddbce3..0d2213ecf8e 100644 --- a/addons/website_event/models/event.py +++ b/addons/website_event/models/event.py @@ -101,8 +101,6 @@ class event(osv.osv): 'website_url': fields.function(_website_url, string="Website url", type="char"), 'show_menu': fields.function(_get_show_menu, fnct_inv=_set_show_menu, type='boolean', string='Dedicated Menu'), 'menu_id': fields.many2one('website.menu', 'Event Menu'), - 'country_id': fields.related('address_id', 'country_id', - type='many2one', relation='res.country', string='Country', readonly=False, states={'done': [('readonly', True)]}, store=True), } _defaults = { 'show_menu': False, From b63b03abd0c8109faa32803d2ae32663e1b64133 Mon Sep 17 00:00:00 2001 From: Fabien Meghazi Date: Thu, 30 Jan 2014 13:26:54 +0100 Subject: [PATCH 12/55] [IMP] better handling of methods for CORS bzr revid: fme@openerp.com-20140130122654-2p481p5hwn033mi7 --- openerp/http.py | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/openerp/http.py b/openerp/http.py index 35cf8f39a7c..717582e2ec5 100644 --- a/openerp/http.py +++ b/openerp/http.py @@ -960,8 +960,12 @@ class Root(object): # Support for Cross-Origin Resource Sharing if request.func.cors: response.headers.set('Access-Control-Allow-Origin', request.func.cors) - if request.func.methods: - response.headers.set('Access-Control-Allow-Methods', ','.join(request.func.methods)) + methods = 'GET, POST' + if request.func_request_type == 'json': + methods = 'POST' + elif request.func.methods: + methods = ', '.join(request.func.methods) + response.headers.set('Access-Control-Allow-Methods', methods) return response From 9ce7c7d561ba3f2aff9f2eafda1c8dffd05e8b1f Mon Sep 17 00:00:00 2001 From: Fabien Meghazi Date: Thu, 30 Jan 2014 13:27:52 +0100 Subject: [PATCH 13/55] [IMP] Use CORS in pos (only two routes) bzr revid: fme@openerp.com-20140130122752-kfgo7u0q0crn3tbr --- addons/hw_proxy/controllers/main.py | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) diff --git a/addons/hw_proxy/controllers/main.py b/addons/hw_proxy/controllers/main.py index adb59a072b3..e6c19e322d6 100644 --- a/addons/hw_proxy/controllers/main.py +++ b/addons/hw_proxy/controllers/main.py @@ -33,16 +33,11 @@ class Proxy(http.Controller): statuses[driver] = drivers[driver].get_status() return statuses - @http.route('/hw_proxy/hello', type='http', auth='none') + @http.route('/hw_proxy/hello', type='http', auth='none', cors='*') def hello(self): - return request.make_response('ping', { - 'Cache-Control': 'no-cache', - 'Content-Type': 'text/html; charset=utf-8', - 'Access-Control-Allow-Origin': '*', - 'Access-Control-Allow-Methods': 'GET', - }) + return "ping" - @http.route('/hw_proxy/handshake', type='json', auth='none') + @http.route('/hw_proxy/handshake', type='json', auth='none', cors='*') def handshake(self): return True From d5031cbee897f8fe6fa111a3cfe4f6510aff9e92 Mon Sep 17 00:00:00 2001 From: Fabien Meghazi Date: Thu, 30 Jan 2014 13:46:06 +0100 Subject: [PATCH 14/55] [ADD] POS: added cors argument to all routes bzr revid: fme@openerp.com-20140130124606-wetmhcjqqvvkv5dy --- addons/hw_escpos/controllers/main.py | 4 +-- addons/hw_proxy/controllers/main.py | 44 +++++++++++++-------------- addons/hw_scanner/controllers/main.py | 4 +-- 3 files changed, 26 insertions(+), 26 deletions(-) diff --git a/addons/hw_escpos/controllers/main.py b/addons/hw_escpos/controllers/main.py index 5b42e97b442..b4312fb94a8 100644 --- a/addons/hw_escpos/controllers/main.py +++ b/addons/hw_escpos/controllers/main.py @@ -259,12 +259,12 @@ hw_proxy.drivers['escpos'] = driver class EscposProxy(hw_proxy.Proxy): - @http.route('/hw_proxy/open_cashbox', type='json', auth='none') + @http.route('/hw_proxy/open_cashbox', type='json', auth='none', cors='*') def open_cashbox(self): _logger.info('ESC/POS: OPEN CASHBOX') driver.push_task('cashbox') - @http.route('/hw_proxy/print_receipt', type='json', auth='none') + @http.route('/hw_proxy/print_receipt', type='json', auth='none', cors='*') def print_receipt(self, receipt): _logger.info('ESC/POS: PRINT RECEIPT') driver.push_task('receipt',receipt) diff --git a/addons/hw_proxy/controllers/main.py b/addons/hw_proxy/controllers/main.py index e6c19e322d6..5293abd1f25 100644 --- a/addons/hw_proxy/controllers/main.py +++ b/addons/hw_proxy/controllers/main.py @@ -41,7 +41,7 @@ class Proxy(http.Controller): def handshake(self): return True - @http.route('/hw_proxy/status', type='http', auth='none') + @http.route('/hw_proxy/status', type='http', auth='none', cors='*') def status_http(self): resp = '\n\n

Hardware Proxy Status

\n' statuses = self.get_status() @@ -70,39 +70,39 @@ class Proxy(http.Controller): 'Access-Control-Allow-Methods': 'GET', }) - @http.route('/hw_proxy/status_json', type='json', auth='none') + @http.route('/hw_proxy/status_json', type='json', auth='none', cors='*') def status_json(self): return self.get_status() - @http.route('/hw_proxy/scan_item_success', type='json', auth='none') + @http.route('/hw_proxy/scan_item_success', type='json', auth='none', cors='*') def scan_item_success(self, ean): """ A product has been scanned with success """ print 'scan_item_success: ' + str(ean) - @http.route('/hw_proxy/scan_item_error_unrecognized', type='json', auth='none') + @http.route('/hw_proxy/scan_item_error_unrecognized', type='json', auth='none', cors='*') def scan_item_error_unrecognized(self, ean): """ A product has been scanned without success """ print 'scan_item_error_unrecognized: ' + str(ean) - @http.route('/hw_proxy/help_needed', type='json', auth='none') + @http.route('/hw_proxy/help_needed', type='json', auth='none', cors='*') def help_needed(self): """ The user wants an help (ex: light is on) """ print "help_needed" - @http.route('/hw_proxy/help_canceled', type='json', auth='none') + @http.route('/hw_proxy/help_canceled', type='json', auth='none', cors='*') def help_canceled(self): """ The user stops the help request """ print "help_canceled" - @http.route('/hw_proxy/weighting_start', type='json', auth='none') + @http.route('/hw_proxy/weighting_start', type='json', auth='none', cors='*') def weighting_start(self): if self.scale == 'closed': print "Opening (Fake) Connection to Scale..." @@ -113,7 +113,7 @@ class Proxy(http.Controller): else: print "WARNING: Scale already Connected !!!" - @http.route('/hw_proxy/weighting_read_kg', type='json', auth='none') + @http.route('/hw_proxy/weighting_read_kg', type='json', auth='none', cors='*') def weighting_read_kg(self): if self.scale == 'open': print "Reading Scale..." @@ -125,7 +125,7 @@ class Proxy(http.Controller): print "WARNING: Reading closed scale !!!" return 0.0 - @http.route('/hw_proxy/weighting_end', type='json', auth='none') + @http.route('/hw_proxy/weighting_end', type='json', auth='none', cors='*') def weighting_end(self): if self.scale == 'open': print "Closing Connection to Scale ..." @@ -136,7 +136,7 @@ class Proxy(http.Controller): else: print "WARNING: Scale already Closed !!!" - @http.route('/hw_proxy/payment_request', type='json', auth='none') + @http.route('/hw_proxy/payment_request', type='json', auth='none', cors='*') def payment_request(self, price): """ The PoS will activate the method payment @@ -144,55 +144,55 @@ class Proxy(http.Controller): print "payment_request: price:"+str(price) return 'ok' - @http.route('/hw_proxy/payment_status', type='json', auth='none') + @http.route('/hw_proxy/payment_status', type='json', auth='none', cors='*') def payment_status(self): print "payment_status" return { 'status':'waiting' } - @http.route('/hw_proxy/payment_cancel', type='json', auth='none') + @http.route('/hw_proxy/payment_cancel', type='json', auth='none', cors='*') def payment_cancel(self): print "payment_cancel" - @http.route('/hw_proxy/transaction_start', type='json', auth='none') + @http.route('/hw_proxy/transaction_start', type='json', auth='none', cors='*') def transaction_start(self): print 'transaction_start' - @http.route('/hw_proxy/transaction_end', type='json', auth='none') + @http.route('/hw_proxy/transaction_end', type='json', auth='none', cors='*') def transaction_end(self): print 'transaction_end' - @http.route('/hw_proxy/cashier_mode_activated', type='json', auth='none') + @http.route('/hw_proxy/cashier_mode_activated', type='json', auth='none', cors='*') def cashier_mode_activated(self): print 'cashier_mode_activated' - @http.route('/hw_proxy/cashier_mode_deactivated', type='json', auth='none') + @http.route('/hw_proxy/cashier_mode_deactivated', type='json', auth='none', cors='*') def cashier_mode_deactivated(self): print 'cashier_mode_deactivated' - @http.route('/hw_proxy/open_cashbox', type='json', auth='none') + @http.route('/hw_proxy/open_cashbox', type='json', auth='none', cors='*') def open_cashbox(self): print 'open_cashbox' - @http.route('/hw_proxy/print_receipt', type='json', auth='none') + @http.route('/hw_proxy/print_receipt', type='json', auth='none', cors='*') def print_receipt(self, receipt): print 'print_receipt' + str(receipt) - @http.route('/hw_proxy/is_scanner_connected', type='json', auth='none') + @http.route('/hw_proxy/is_scanner_connected', type='json', auth='none', cors='*') def print_receipt(self, receipt): print 'is_scanner_connected?' return False - @http.route('/hw_proxy/scanner', type='json', auth='none') + @http.route('/hw_proxy/scanner', type='json', auth='none', cors='*') def print_receipt(self, receipt): print 'scanner' time.sleep(10) return '' - @http.route('/hw_proxy/log', type='json', auth='none') + @http.route('/hw_proxy/log', type='json', auth='none', cors='*') def log(self, arguments): _logger.info(' '.join(str(v) for v in arguments)) - @http.route('/hw_proxy/print_pdf_invoice', type='json', auth='none') + @http.route('/hw_proxy/print_pdf_invoice', type='json', auth='none', cors='*') def print_pdf_invoice(self, pdfinvoice): print 'print_pdf_invoice' + str(pdfinvoice) diff --git a/addons/hw_scanner/controllers/main.py b/addons/hw_scanner/controllers/main.py index 664606954c3..105856a3e28 100644 --- a/addons/hw_scanner/controllers/main.py +++ b/addons/hw_scanner/controllers/main.py @@ -124,7 +124,7 @@ class Scanner(Thread): self.set_status('error',str(e)) return None - @http.route('/hw_proxy/Vis_scanner_connected', type='json', auth='none') + @http.route('/hw_proxy/Vis_scanner_connected', type='json', auth='none', cors='*') def is_scanner_connected(self): return self.get_device() != None @@ -207,7 +207,7 @@ s = Scanner() hw_proxy.drivers['scanner'] = s class ScannerDriver(hw_proxy.Proxy): - @http.route('/hw_proxy/scanner', type='json', auth='none') + @http.route('/hw_proxy/scanner', type='json', auth='none', cors='*') def scanner(self): if not s.isAlive(): s.start() From 369a88a5a1fb9b2dedb46a463c9ad70cad7ba87b Mon Sep 17 00:00:00 2001 From: Denis Ledoux Date: Thu, 30 Jan 2014 16:49:10 +0100 Subject: [PATCH 15/55] [FIX] event_sale, website_event: copy paste errors in views bzr revid: dle@openerp.com-20140130154910-xmg8dehh0zubgif8 --- addons/event_sale/event_sale_view.xml | 2 +- addons/website_event_track/views/event_backend.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/addons/event_sale/event_sale_view.xml b/addons/event_sale/event_sale_view.xml index 9d1df61cd39..955319f5024 100644 --- a/addons/event_sale/event_sale_view.xml +++ b/addons/event_sale/event_sale_view.xml @@ -3,7 +3,7 @@ event.product - product.template + product.product
diff --git a/addons/website_event_track/views/event_backend.xml b/addons/website_event_track/views/event_backend.xml index 5ef9401f00c..aa0a2d10ced 100644 --- a/addons/website_event_track/views/event_backend.xml +++ b/addons/website_event_track/views/event_backend.xml @@ -256,7 +256,7 @@ event.track - + From a2fba1c288d724e6918a71de4c150b101626a8a0 Mon Sep 17 00:00:00 2001 From: Denis Ledoux Date: Thu, 30 Jan 2014 16:56:00 +0100 Subject: [PATCH 16/55] [FIX] website_membership: do not display '0' in country list head if there is no result bzr revid: dle@openerp.com-20140130155600-bh412ye3sqsao56p --- addons/website_membership/views/website_membership.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/addons/website_membership/views/website_membership.xml b/addons/website_membership/views/website_membership.xml index 72d43aeff30..7d9d7b418ab 100644 --- a/addons/website_membership/views/website_membership.xml +++ b/addons/website_membership/views/website_membership.xml @@ -88,7 +88,7 @@
  • - +
    • From 650a0b021c40f58cb69e43732f9d219940987763 Mon Sep 17 00:00:00 2001 From: openerp-sle Date: Thu, 30 Jan 2014 16:58:02 +0100 Subject: [PATCH 17/55] [FIX] website_membership: need to add website_sale in the dependancies list for membership sorting as website_sequence is defined there bzr revid: openerp-sle@openerp-sle.home-20140130155802-f8kuvin9ih41gr48 --- addons/website_membership/__openerp__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/addons/website_membership/__openerp__.py b/addons/website_membership/__openerp__.py index 8f4bc905dda..5932507f3d5 100644 --- a/addons/website_membership/__openerp__.py +++ b/addons/website_membership/__openerp__.py @@ -9,7 +9,7 @@ Website for browsing Associations, Groups and Memberships ========================================================= """, 'author': 'OpenERP SA', - 'depends': ['website_partner', 'website_google_map', 'association'], + 'depends': ['website_partner', 'website_google_map', 'association', 'website_sale'], 'data': [ 'views/website_membership.xml', 'security/ir.model.access.csv', From a4a25292e718f5730c9c7641f5fc686930d1ed7e Mon Sep 17 00:00:00 2001 From: Denis Ledoux Date: Thu, 30 Jan 2014 17:11:32 +0100 Subject: [PATCH 18/55] [FIX]website_customer: group by country based on the result of the search, + do not display '0' right to All countries if no result + display 'No result found' bzr revid: dle@openerp.com-20140130161132-cbn9z0i7aphzdrbn --- addons/website_customer/controllers/main.py | 6 +++--- addons/website_customer/views/website_customer.xml | 5 ++++- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/addons/website_customer/controllers/main.py b/addons/website_customer/controllers/main.py index be9f95d0d94..921e88141f1 100644 --- a/addons/website_customer/controllers/main.py +++ b/addons/website_customer/controllers/main.py @@ -37,12 +37,12 @@ class WebsiteCustomer(http.Controller): if country_id: domain += [('country_id', '=', country_id)] - # group by country, based on all customers (base domain) + # group by country, based on customers found with the search(domain) countries = partner_obj.read_group( - cr, openerp.SUPERUSER_ID, base_domain, ["id", "country_id"], + cr, openerp.SUPERUSER_ID, domain, ["id", "country_id"], groupby="country_id", orderby="country_id", context=request.context) country_count = partner_obj.search( - cr, openerp.SUPERUSER_ID, base_domain, count=True, context=request.context) + cr, openerp.SUPERUSER_ID, domain, count=True, context=request.context) countries.insert(0, { 'country_id_count': country_count, 'country_id': (0, _("All Countries")) diff --git a/addons/website_customer/views/website_customer.xml b/addons/website_customer/views/website_customer.xml index 64eeb3220a4..e5b8cc44ecd 100644 --- a/addons/website_customer/views/website_customer.xml +++ b/addons/website_customer/views/website_customer.xml @@ -39,6 +39,9 @@
    + +

    No result found.

    +
    @@ -79,7 +82,7 @@
  • - +
    • From 78fefd54f069ea050c4502b3f49e8b1042102110 Mon Sep 17 00:00:00 2001 From: Olivier Dony Date: Thu, 30 Jan 2014 17:26:15 +0100 Subject: [PATCH 19/55] [IMP] website tests: unicode test attributes to avoid warnings in auto_init when comparing attr values bzr revid: odo@openerp.com-20140130162615-nx7f3nhifwqo357u --- addons/website/models/test_models.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/addons/website/models/test_models.py b/addons/website/models/test_models.py index d028cdd9864..107b8ae3e35 100644 --- a/addons/website/models/test_models.py +++ b/addons/website/models/test_models.py @@ -24,8 +24,8 @@ class test_converter(orm.Model): ('B', "Qu'il était supposé arriver à Toronto"), ('C', "Qu'est-ce qu'il fout ce maudit pancake, tabernacle ?"), ('D', "La réponse D"), - ], string="Lorsqu'un pancake prend l'avion à destination de Toronto et " - "qu'il fait une escale technique à St Claude, on dit:"), + ], string=u"Lorsqu'un pancake prend l'avion à destination de Toronto et " + u"qu'il fait une escale technique à St Claude, on dit:"), 'html': fields.html(), 'text': fields.text(), } From 3b48a82af5ee314cd4b7371a6dec8d05f93e7df9 Mon Sep 17 00:00:00 2001 From: Fabien Pinckaers Date: Thu, 30 Jan 2014 17:33:21 +0100 Subject: [PATCH 20/55] [FIX] events bzr revid: fp@tinyerp.com-20140130163321-f86eq7obsua6x6z9 --- addons/event/__init__.py | 2 -- addons/website_event/__openerp__.py | 2 -- addons/website_event/controllers/main.py | 23 ++++++------------- addons/website_event/models/event.py | 21 +++++++++-------- addons/website_event/views/website_event.xml | 9 ++++---- addons/website_event_sale/controllers/main.py | 16 +++++++++++++ addons/website_event_track/__openerp__.py | 11 +++++++-- .../website_event_track/controllers/event.py | 5 +--- addons/website_event_track/models/event.py | 21 ++++++++--------- 9 files changed, 59 insertions(+), 51 deletions(-) diff --git a/addons/event/__init__.py b/addons/event/__init__.py index ce8b64ed9a9..d653a6d4081 100644 --- a/addons/event/__init__.py +++ b/addons/event/__init__.py @@ -23,5 +23,3 @@ import event import wizard import report import res_partner -# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: - diff --git a/addons/website_event/__openerp__.py b/addons/website_event/__openerp__.py index 399a6a17fb8..b04758b0d55 100644 --- a/addons/website_event/__openerp__.py +++ b/addons/website_event/__openerp__.py @@ -7,8 +7,6 @@ 'version': '1.0', 'description': """ Online Events -============= - """, 'author': 'OpenERP SA', 'depends': ['website', 'website_partner', 'website_mail', 'event'], diff --git a/addons/website_event/controllers/main.py b/addons/website_event/controllers/main.py index 21b984f6888..83e2c45f75b 100644 --- a/addons/website_event/controllers/main.py +++ b/addons/website_event/controllers/main.py @@ -145,6 +145,8 @@ class website_event(http.Controller): events_ids = event_obj.browse(request.cr, request.uid, obj_ids, context=request.context) + for d in dates: + print '***', d values = { 'current_date': current_date, 'current_country': current_country, @@ -184,7 +186,6 @@ class website_event(http.Controller): 'event': event, 'main_object': event, 'range': range, - 'main_object': event, } return request.website.render("website_event.event_description_full", values) @@ -202,25 +203,15 @@ class website_event(http.Controller): @http.route('/event/add_event/', type='http', auth="user", multilang=True, methods=['POST'], website=True) def add_event(self, event_name="New Event", **kwargs): - Event = request.registry.get('event.event') - date_begin = datetime.today() + timedelta(days=(15)) # FIXME: better defaults + return self._add_event(event_name, request.context, **kwargs) + def _add_event(self, event_name="New Event", context={}, **kwargs): + Event = request.registry.get('event.event') + date_begin = datetime.today() + timedelta(days=(14)) vals = { 'name': event_name, 'date_begin': date_begin.strftime('%Y-%m-%d'), 'date_end': (date_begin + timedelta(days=(1))).strftime('%Y-%m-%d'), } - try: - dummy, res_id = request.registry.get('ir.model.data').get_object_reference(request.cr, request.uid, 'event_sale', 'product_product_event') - vals['event_ticket_ids'] = [[0,0,{ - 'name': _('Subscription'), - 'product_id': res_id, - 'deadline' : vals.get('date_begin'), - 'price': 0, - }]] - except ValueError: - pass - - event_id = Event.create(request.cr, request.uid, vals, context=request.context) - + event_id = Event.create(request.cr, request.uid, vals, context=context) return request.redirect("/event/%s/?enable_editor=1" % event_id) diff --git a/addons/website_event/models/event.py b/addons/website_event/models/event.py index 0d2213ecf8e..33eee7c7829 100644 --- a/addons/website_event/models/event.py +++ b/addons/website_event/models/event.py @@ -25,6 +25,8 @@ from openerp import SUPERUSER_ID from openerp.tools.translate import _ import re +from openerp.addons.website.models.website import slug + class event(osv.osv): _name = 'event.event' @@ -41,7 +43,7 @@ class event(osv.osv): for name,path in todo: name2 = name+' '+event.name newpath = web.new_page(cr, uid, name2, path, ispage=False, context=context) - url = "/event/"+str(event.id)+"/page/" + newpath + url = "/event/"+slug(event)+"/page/" + newpath result.append((name, url)) return result @@ -56,7 +58,7 @@ class event(osv.osv): 'name': event.name }, context=context) tocreate = self._get_new_menu_pages(cr, uid, event, context) - tocreate.append((_('Register'), '/event/%s/register' % str(event.id))) + tocreate.append((_('Register'), '/event/%s/register' % slug(event))) sequence = 0 for name,url in tocreate: menuobj.create(cr, uid, { @@ -77,14 +79,13 @@ class event(osv.osv): def _website_url(self, cr, uid, ids, field_name, arg, context=None): res = dict.fromkeys(ids, '') - base_url = self.pool.get('ir.config_parameter').get_param(cr, uid, 'web.base.url') for event in self.browse(cr, uid, ids, context=context): - res[event.id] = "%s/event/%s/" % (base_url, event.id) + res[event.id] = "/event/" + slug(event) return res def _default_hashtag(self, cr, uid, context={}): name = self.pool.get('res.users').browse(cr, uid, uid, context=context).company_id.name - return re.sub("[- \\.\\(\\)]+", "", name).lower() + return re.sub("[- \\.\\(\\)\\@\\#\\&]+", "", name).lower() _columns = { 'twitter_hashtag': fields.char('Twitter Hashtag'), @@ -108,12 +109,14 @@ class event(osv.osv): } def google_map_img(self, cr, uid, ids, zoom=8, width=298, height=298, context=None): - partner = self.browse(cr, uid, ids[0], context=context) - if partner.address_id: + event = self.browse(cr, uid, ids[0], context=context) + if event.address_id: return self.browse(cr, SUPERUSER_ID, ids[0], context=context).address_id.google_map_img() + return None def google_map_link(self, cr, uid, ids, zoom=8, context=None): - partner = self.browse(cr, uid, ids[0], context=context) - if partner.address_id: + event = self.browse(cr, uid, ids[0], context=context) + if event.address_id: return self.browse(cr, SUPERUSER_ID, ids[0], context=context).address_id.google_map_link() + return None diff --git a/addons/website_event/views/website_event.xml b/addons/website_event/views/website_event.xml index bb536795adc..e6235e87b4a 100644 --- a/addons/website_event/views/website_event.xml +++ b/addons/website_event/views/website_event.xml @@ -127,7 +127,7 @@ - + + From f85065930eb612456bada99b7f5492f3a6036868 Mon Sep 17 00:00:00 2001 From: Denis Ledoux Date: Thu, 30 Jan 2014 20:37:06 +0100 Subject: [PATCH 36/55] [FIX]website_customer, website_crm_partner_assign: keep search if jump between countries, and keep countries if do a new search. bzr revid: dle@openerp.com-20140130193706-xxn668p2edr69zue --- addons/website_crm_partner_assign/controllers/main.py | 4 +--- .../views/website_crm_partner_assign.xml | 2 +- addons/website_customer/controllers/main.py | 9 ++++++++- addons/website_customer/views/website_customer.xml | 4 ++-- 4 files changed, 12 insertions(+), 7 deletions(-) diff --git a/addons/website_crm_partner_assign/controllers/main.py b/addons/website_crm_partner_assign/controllers/main.py index da05075445a..17a666cf2e3 100644 --- a/addons/website_crm_partner_assign/controllers/main.py +++ b/addons/website_crm_partner_assign/controllers/main.py @@ -1,14 +1,12 @@ # -*- coding: utf-8 -*- -import werkzeug.urls - import openerp from openerp import SUPERUSER_ID from openerp.addons.web import http from openerp.tools.translate import _ from openerp.addons.web.http import request from openerp.addons.website_partner.controllers import main as website_partner - +import werkzeug.urls class WebsiteCrmPartnerAssign(http.Controller): _references_per_page = 20 diff --git a/addons/website_crm_partner_assign/views/website_crm_partner_assign.xml b/addons/website_crm_partner_assign/views/website_crm_partner_assign.xml index a0082fb929c..9906eaf87c6 100644 --- a/addons/website_crm_partner_assign/views/website_crm_partner_assign.xml +++ b/addons/website_crm_partner_assign/views/website_crm_partner_assign.xml @@ -55,7 +55,7 @@ pull-left -
    +
    diff --git a/addons/website_customer/controllers/main.py b/addons/website_customer/controllers/main.py index 9e026c135a2..2ee5e446c5d 100644 --- a/addons/website_customer/controllers/main.py +++ b/addons/website_customer/controllers/main.py @@ -8,7 +8,6 @@ from openerp.addons.web.http import request from openerp.addons.website_partner.controllers import main as website_partner import werkzeug.urls - class WebsiteCustomer(http.Controller): _references_per_page = 20 @@ -22,6 +21,7 @@ class WebsiteCustomer(http.Controller): ], type='http', auth="public", website=True, multilang=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'] partner_obj = request.registry['res.partner'] partner_name = post.get('search', '') @@ -47,6 +47,13 @@ class WebsiteCustomer(http.Controller): if country_id: domain += [('country_id', '=', country_id)] + if not any(x['country_id'][0] == country_id for x in countries): + country = country_obj.browse(cr, uid, country_id, context) + countries.append({ + 'country_id_count': 0, + 'country_id': (country_id, country.name) + }) + countries.sort(key=lambda d: d['country_id'][1]) # search customers to display partner_ids = partner_obj.search(cr, openerp.SUPERUSER_ID, domain, context=request.context) diff --git a/addons/website_customer/views/website_customer.xml b/addons/website_customer/views/website_customer.xml index 97b6fa29f80..d58e3dfa262 100644 --- a/addons/website_customer/views/website_customer.xml +++ b/addons/website_customer/views/website_customer.xml @@ -30,7 +30,7 @@ - +
    @@ -82,7 +82,7 @@
  • - +
    • From a1b95f68236988d83ec881cb903e87757fc5d29d Mon Sep 17 00:00:00 2001 From: Fabien Pinckaers Date: Thu, 30 Jan 2014 20:42:27 +0100 Subject: [PATCH 37/55] [FIX] Customize menu bzr revid: fp@tinyerp.com-20140130194227-b5brj96f8tgc88hf --- addons/website/controllers/main.py | 2 +- addons/website/models/ir_ui_view.py | 18 ++++++++++-------- 2 files changed, 11 insertions(+), 9 deletions(-) diff --git a/addons/website/controllers/main.py b/addons/website/controllers/main.py index 1cf64f3d2b3..b9fc68bb667 100644 --- a/addons/website/controllers/main.py +++ b/addons/website/controllers/main.py @@ -168,7 +168,7 @@ class Website(openerp.addons.web.controllers.main.Home): group_ids = [g.id for g in user.groups_id] view = request.registry.get("ir.ui.view") - views = view._views_get(request.cr, request.uid, xml_id, request.context) + views = view._views_get(request.cr, request.uid, xml_id, context=request.context) done = {} result = [] for v in views: diff --git a/addons/website/models/ir_ui_view.py b/addons/website/models/ir_ui_view.py index fadcc8e1276..95e2179c9ec 100644 --- a/addons/website/models/ir_ui_view.py +++ b/addons/website/models/ir_ui_view.py @@ -46,6 +46,16 @@ class view(osv.osv): view = view.inherit_id result = [view] + + node = etree.fromstring(view.arch) + for child in node.xpath("//t[@t-call]"): + try: + call_view = view_obj(child.get('t-call')) + except ValueError: + continue + if call_view not in result: + result += self._views_get(cr, uid, call_view, options=options, context=context, stack_result=result) + todo = view.inherit_children_ids if options: todo += filter(lambda x: not x.inherit_id, view.inherited_option_ids) @@ -55,14 +65,6 @@ class view(osv.osv): for r in self._views_get(cr, uid, child_view, options=bool(child_view.inherit_id), context=context, root=False, stack_result=result): if r not in result: result.append(r) - node = etree.fromstring(view.arch) - for child in node.xpath("//t[@t-call]"): - try: - call_view = view_obj(child.get('t-call')) - except ValueError: - continue - if call_view not in result: - result += self._views_get(cr, uid, call_view, options=options, context=context, stack_result=result) return result def extract_embedded_fields(self, cr, uid, arch, context=None): From 60fc222a180430929a544a7702c223b47b21ec9c Mon Sep 17 00:00:00 2001 From: Fabien Pinckaers Date: Thu, 30 Jan 2014 20:50:02 +0100 Subject: [PATCH 38/55] [REM] unused file bzr revid: fp@tinyerp.com-20140130195002-713rvmzn7e8iz7xl --- addons/website/static/src/img/odoo_logo.png | Bin 3303 -> 0 bytes 1 file changed, 0 insertions(+), 0 deletions(-) delete mode 100644 addons/website/static/src/img/odoo_logo.png diff --git a/addons/website/static/src/img/odoo_logo.png b/addons/website/static/src/img/odoo_logo.png deleted file mode 100644 index 4ba081e1d42a4724989d3d014c447a07c57c0720..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 3303 zcmVfo?P)TGEo1Z(lsAJQVf^+5pACWZ)!VJ@6zj(-#WXq}BTEh&Khpgaqd?EAEnjW0*&Vj1tY-gaSZf1@K{S+s8Y(Sl*%}&(WWmH+zu20 z9{}}0RBmkqruag^O)b!Hoq+3r$x5k{j_N+og+4C^ehU-=i+!QskQQjTOyCvZB3E`8 zskQ#}sEa%!3SR@R1S)`ITj&}`0)1V7_X5rmqkgBQITo-F_y;gP><h_P%sLt z1$H&HK`$*T8;HY^P6KWOf~7@eBhqF%a*@}NI+p_d!u~+VCX6!(ILD|@g$aNXk5bBW zv>7k68IAW2a3L@hm>c#7a$U6xX)9`h8eb?_8)KZP<=TE*&xXU~WC87fPJmY_wGG%S zWWqtMbtJ}^$spBiAVVBI>RyM|x~cUTrBt@8BSUl*1?prC5v_Ifh#Joq3LXgi151Hi z;EJ$6kON#M^{ay{b_?(y;MK4{@Gh`Nntr!*6y@v}Q1KS9$Q@wLZ|1Yh9b<_#U7Qa6B+VvP&-@Pu9L( z`smk{QtNwQT?S^;o7Fgk%p z76A7G%Sr1&aH9Yn$8dF$3T-lC ze@4!;J*(Cq7x89Jvl&k0X5hgXhKoq5sREj^i+?%r&p3vQS35@muPUXw#W7qiFiFsK zR+4kH2JQxCDW!6nT=T;IfJczw-z~RmfUkjVk|J9JJ)~|NBgMHv2KTP~Y}dfASI+;H zebH9}Q=~?i-ndC>!^cvO`T^$xCz8b0lv1h?cwFAibc}uSvsK3IB(>d4si#Vv9j3M3 zZ;YRX!w26JBdYew&n~HZ9c7L-MwT2cdY#f#z;XgG)8a+jrEbmig@S7hgI@-eNP5cp z#@#$4_hshY2HavSx(5!SYcc(0i3Qoan<^>m^16 zT><|*SenRCS_v0ti7SUWdTdleWBp9ah}ZuegoWU)ZCAO$-YqVE!QF@;hdFmJJ~j1vetS|BSyJKYGn6# zHBTvZhbTMOXnk(fT0b3U{0zxDKQZ3#0MJKkz0u_yv&9KbFf~qV{a&0o`TS4snjB z8yUY&Ydr>d)54ohbp74QVz|w~_;`ksIo3$@tub!(2QE+5c%3Y~;|gCW_(+0%;V$vo z4WDWzYtt33CV#l``Gdd< zTI;1rv^&#{Yu$nKy)IrczqF{VdudTwx6-1r4sp_67S0JWGwNPU(g8jdbmx|?KyUfI zv!!NzptW9|=mc8pN@>^+#Q4bB9DXKewg8nx=lI-+J`ZrRQYv52{J9o3>airoj{++= z{PaS9Z)s7PM+o5uaCQgY24<8NmG!d?*0y$^7w4d@TdIKNNwP9KflrLf?FDHesVvu$ zZjzPNz@8ZQdPtgc%fFLlOhjj9O71O&G+U2KNr%bEZZY5?fH70@=i5@paHXt~rA1}K zB|Xs~*GCh_)G!-tf#`0Xm`8GAyG=*W6ndwf<$>;!3a826Cuc@$yMEQG%hmyV*6fLRGfj@PLkcg|&hnDg zu4t|_#!Y3n{zOZUxXXnM-G)8Jfc}X}zU5k#YYvP#l9en=Us>e^hQxWOFYufo!^yz# zI*+$^W;C+S_*|~kk7U}7PJ%Ga^srTa-zsFbTLvnnPE2y)gC!liWuvRLF218|yg?MrVXlv0%xa0Q$b#nbPmc@xI$&uH_RrB+>@?&QcSH;V}J)GAEbf>=C+UsVnl9TO#ASWTHbU)fKqJxcrsYdb1eueT$=C zn}V)PbYI~GUW(HP%`GV}zM-VN_??pS;?Hj`A7A4Xqv%#qf?LiA`va2_jJo4+wscGn z49n3%wAMR?`idB7cDz#RyabfmOV|!GQs)9Y)fq$zFKeC#6&{*eW(-s=km@3Jf)0F=5~h^UOW7kD0LM`M$`cNb}j$6D%K zEpQDmPj=WF#_uc+a+<{mcS{eq!?liF=|3j`Kewpn39a>bgWEg{=cIw@3>8Ant&sU5 z0{-%Z=)Rf5&jsxOrfRJpOL;#}b`=UG?b=Y_eqf2zv1|b+gJKLf-$V4~0iowMSd5ni z+yUHW>B$n6h>+;_*fveYL1tp#*7_27S9;7$oQ>3rICN*kojrzXt#?^?(5b@d+9GY0 z1k7$hm4mRKoU0eEbE4L|zNsgsGlZCZFhv-Thv*w$Nia(pHS~oKo>D!U-4#-0Hg}w9j*1YrmRCL zH5}&zoKI49mVl*dalrS07n32%jqzJc$r&beWRBF-TEPon3fi8pwcc(oIY&Uk{=gvM zZ#ZW=b^=~sD7d4s=Sqvpyf{bQe*hjVC9 Date: Thu, 30 Jan 2014 20:50:43 +0100 Subject: [PATCH 39/55] [FIX] url_for() bzr revid: fme@openerp.com-20140130195043-pkfkmqg80c2yk5p5 --- addons/website/models/website.py | 35 +++++++++++++++------- addons/website/views/website_templates.xml | 2 +- 2 files changed, 25 insertions(+), 12 deletions(-) diff --git a/addons/website/models/website.py b/addons/website/models/website.py index f16d31418f1..0c71508edf4 100644 --- a/addons/website/models/website.py +++ b/addons/website/models/website.py @@ -5,7 +5,6 @@ import itertools import logging import math import re -import urllib import urlparse import simplejson @@ -38,24 +37,38 @@ def keep_query(*args, **kw): def url_for(path_or_uri, lang=None): location = path_or_uri.strip() + force_lang = lang is not None url = urlparse.urlparse(location) - if request and url.path and not url.netloc and not url.scheme: + + if request and not url.netloc and not url.scheme and (url.path or force_lang): location = urlparse.urljoin(request.httprequest.path, location) - force_lang = lang is not None lang = lang or request.context.get('lang') langs = [lg[0] for lg in request.website.get_languages()] - if lang != request.website.default_lang_code and (force_lang or (location[0] == '/' and len(langs) > 1)): - if is_multilang_url(location): - ps = location.split('/') - if ps[1] in langs: + + if (len(langs) > 1 or force_lang) and is_multilang_url(location, langs): + ps = location.split('/') + if ps[1] in langs: + # Replace the language only if we explicitly provide a language to url_for + if force_lang: ps[1] = lang - else: - ps.insert(1, lang) - location = '/'.join(ps) + # Remove the default language unless it's explicitly provided + elif ps[1] == request.website.default_lang_code: + ps.pop(1) + # Insert the context language or the provided language + elif lang != request.website.default_lang_code or force_lang: + ps.insert(1, lang) + location = '/'.join(ps) return location -def is_multilang_url(path): +def is_multilang_url(path, langs=None): + if not langs: + langs = [lg[0] for lg in request.website.get_languages()] + spath = path.split('/') + # if a language is already in the path, remove it + if spath[1] in langs: + spath.pop(1) + path = '/'.join(spath) try: router = request.httprequest.app.get_db_router(request.db).bind('') func = router.match(path)[0] diff --git a/addons/website/views/website_templates.xml b/addons/website/views/website_templates.xml index 05c3220544f..e34d1e5925a 100644 --- a/addons/website/views/website_templates.xml +++ b/addons/website/views/website_templates.xml @@ -16,7 +16,7 @@ ((submenu.url != '/' and request.httprequest.path.startswith(submenu.url)) or request.httprequest.path == submenu.url) and 'active' "> - + From 320b840341838864d9a2a481b183610baf9b04a8 Mon Sep 17 00:00:00 2001 From: Denis Ledoux Date: Thu, 30 Jan 2014 21:57:13 +0100 Subject: [PATCH 40/55] [FIX] website_membership, website_customer: keep search, country and assocations when jumping from each other of these filters + count fix between partners displayed and group by country count + fix country orders in website_customer bzr revid: dle@openerp.com-20140130205713-09cbldm9r9pm6r1i --- addons/website_customer/controllers/main.py | 9 ++++---- addons/website_membership/controllers/main.py | 22 ++++++++++++++----- .../views/website_membership.xml | 8 +++---- 3 files changed, 26 insertions(+), 13 deletions(-) diff --git a/addons/website_customer/controllers/main.py b/addons/website_customer/controllers/main.py index 2ee5e446c5d..173b0871dbe 100644 --- a/addons/website_customer/controllers/main.py +++ b/addons/website_customer/controllers/main.py @@ -40,10 +40,6 @@ class WebsiteCustomer(http.Controller): groupby="country_id", orderby="country_id", context=request.context) country_count = partner_obj.search( cr, openerp.SUPERUSER_ID, domain, count=True, context=request.context) - countries.insert(0, { - 'country_id_count': country_count, - 'country_id': (0, _("All Countries")) - }) if country_id: domain += [('country_id', '=', country_id)] @@ -55,6 +51,11 @@ class WebsiteCustomer(http.Controller): }) countries.sort(key=lambda d: d['country_id'][1]) + countries.insert(0, { + 'country_id_count': country_count, + 'country_id': (0, _("All Countries")) + }) + # search customers to display partner_ids = partner_obj.search(cr, openerp.SUPERUSER_ID, domain, context=request.context) google_map_partner_ids = ",".join([str(p) for p in partner_ids]) diff --git a/addons/website_membership/controllers/main.py b/addons/website_membership/controllers/main.py index 5b760370447..a4932c1b46c 100644 --- a/addons/website_membership/controllers/main.py +++ b/addons/website_membership/controllers/main.py @@ -32,12 +32,14 @@ class WebsiteMembership(http.Controller): 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'] + country_obj = request.registry['res.country'] membership_line_obj = request.registry['membership.membership_line'] partner_obj = request.registry['res.partner'] post_name = post.get('name', '') + current_country = None # base domain for groupby / searches - base_line_domain = [('state', 'in', ['free', 'paid'])] + base_line_domain = [("partner.website_published", "=", True),('state', 'in', ['free', 'paid'])] if membership_id: base_line_domain.append(('membership_id', '=', membership_id)) membership = product_obj.browse(cr, uid, membership_id, context=context) @@ -53,16 +55,24 @@ class WebsiteMembership(http.Controller): cr, uid, [('member_lines', 'in', membership_line_ids), ("website_published", "=", True)], ["id", "country_id"], groupby="country_id", orderby="country_id", context=request.context) countries_total = sum(country_dict['country_id_count'] for country_dict in countries) + + line_domain = list(base_line_domain) + if country_id: + line_domain.append(('partner.country_id', '=', country_id)) + current_country = country_obj.read(cr, uid, country_id, ['id', 'name'], context) + if not any(x['country_id'][0] == country_id for x in countries): + countries.append({ + 'country_id_count': 0, + 'country_id': (country_id, current_country["name"]) + }) + countries.sort(key=lambda d: d['country_id'][1]) + countries.insert(0, { 'country_id_count': countries_total, 'country_id': (0, _("All Countries")) }) # displayed membership lines - line_domain = list(base_line_domain) - if country_id: - line_domain.append(('partner.country_id', '=', country_id)) - membership_line_ids = membership_line_obj.search(cr, uid, line_domain, context=context) membership_lines = membership_line_obj.browse(cr, uid, membership_line_ids, context=context) membership_lines.sort(key=lambda x: x.membership_id.website_sequence) @@ -86,6 +96,8 @@ class WebsiteMembership(http.Controller): 'memberships': memberships, 'membership': membership, 'countries': countries, + 'current_country': current_country and [current_country['id'], current_country['name']] or None, + 'current_country_id': current_country and current_country['id'] or 0, 'google_map_partner_ids': google_map_partner_ids, 'pager': pager, 'post': post, diff --git a/addons/website_membership/views/website_membership.xml b/addons/website_membership/views/website_membership.xml index 7d9d7b418ab..8e9ceb0b387 100644 --- a/addons/website_membership/views/website_membership.xml +++ b/addons/website_membership/views/website_membership.xml @@ -34,7 +34,7 @@
  • All
  • - +
    • @@ -44,7 +44,7 @@ pull-left - +
    @@ -86,9 +86,9 @@

    • Location

      • -
    • +
    • - +
      • From 110f3dd9102167b76d235c33f9aa1b9c991efc1b Mon Sep 17 00:00:00 2001 From: Christophe Matthieu Date: Thu, 30 Jan 2014 22:00:01 +0100 Subject: [PATCH 41/55] [IMP] website tour: refactoring: Check dom insead of trigger bzr revid: chm@openerp.com-20140130210001-kiecx5nde2um3ni1 --- .../website/static/src/js/website.editor.js | 1 + .../static/src/js/website.tour.banner.js | 49 +- addons/website/static/src/js/website.tour.js | 920 ++++++++---------- .../website/tests/ui_suite/homepage_test.js | 7 +- .../static/src/js/website.tour.blog.js | 55 +- .../website_blog/tests/ui_suite/post_test.js | 6 +- .../static/src/js/website.tour.event.js | 76 +- .../tests/ui_suite/event_test.js | 6 +- .../static/src/js/website.tour.shop.js | 312 +++--- addons/website_sale/tests/test_ui.py | 4 +- .../website_sale-sale_process-test-2.js | 6 +- .../website_sale-sale_process-test.js | 6 +- 12 files changed, 575 insertions(+), 873 deletions(-) diff --git a/addons/website/static/src/js/website.editor.js b/addons/website/static/src/js/website.editor.js index 55ab6e8fcad..ab97ee2bcf9 100644 --- a/addons/website/static/src/js/website.editor.js +++ b/addons/website/static/src/js/website.editor.js @@ -488,6 +488,7 @@ $('.css_non_editable_mode_hidden').removeClass("css_non_editable_mode_hidden"); this.rte.start_edition().then(this.check_height.bind(this)); + this.trigger('rte:called'); }, rte_changed: function () { this.$buttons.save.prop('disabled', false); diff --git a/addons/website/static/src/js/website.tour.banner.js b/addons/website/static/src/js/website.tour.banner.js index d01d66b6514..2c26ae34e98 100644 --- a/addons/website/static/src/js/website.tour.banner.js +++ b/addons/website/static/src/js/website.tour.banner.js @@ -18,53 +18,43 @@ var self = this; self.steps = [ { - stepId: 'welcome', title: "Welcome to your website!", content: "This tutorial will guide you to build your home page. We will start by adding a banner.", template: self.popover({ next: "Start Tutorial", end: "Skip It" }), backdrop: true, }, { - stepId: 'edit-page', + waitNot: '.popover.tour', element: 'button[data-action=edit]', placement: 'bottom', title: "Edit this page", content: "Every page of your website can be modified through the Edit button.", template: self.popover({ fixed: true }), - trigger: { - id: 'rte:ready', - type: 'openerp', - emitter: editor, - }, }, { - stepId: 'add-banner', element: 'button[data-action=snippet]', placement: 'bottom', title: "Insert building blocks", content: "To add content in a page, you can insert building blocks.", template: self.popover({ fixed: true }), - trigger: 'click', }, { - stepId: 'drag-banner', snippet: 'carousel', placement: 'bottom', title: "Drag & Drop a Banner", content: "Drag the Banner block and drop it in your page.", template: self.popover({ fixed: true }), - trigger: 'drag', }, { - stepId: 'edit-title', + waitFor: '.oe_overlay_options .oe_options:visible', element: '#wrap [data-snippet-id=carousel]:first .carousel-caption', + sampleText: 'My Title', placement: 'top', title: "Customize banner's text", content: "Click in the text and start editing it. Click continue once it's done.", - template: self.popover({ next: "Continue" }), }, { - stepId: 'customize-banner', + waitNot: '#wrap [data-snippet-id=carousel]:first .carousel-caption:contains("Your Banner Title")', element: '.oe_overlay_options .oe_options', placement: 'left', title: "Customize the banner", @@ -72,67 +62,54 @@ template: self.popover({ next: "Continue" }), }, { - stepId: 'add-three-cols', + waitNot: '.popover.tour', element: 'button[data-action=snippet]', placement: 'bottom', title: "Add Another Block", content: "Let's add another building block to your page.", template: self.popover({ fixed: true }), - trigger: 'click', }, { - stepId: 'drag-three-columns', snippet: 'three-columns', placement: 'bottom', title: "Drag & Drop a Block", content: "Drag the '3 Columns' block and drop it below the banner.", template: self.popover({ fixed: true }), - trigger: 'drag', }, { - stepId: 'save-changes', + waitFor: '.oe_overlay_options .oe_options:visible', element: 'button[data-action=save]', placement: 'right', title: "Save your modifications", content: "Publish your page by clicking on the 'Save' button.", template: self.popover({ fixed: true }), - trigger: 'reload', }, { - stepId: 'part-2', + waitFor: 'button[data-action=edit]:visible', title: "Congratulation!", content: "Your homepage has been updated.", template: self.popover({ next: "Continue" }), }, { - stepId: 'show-mobile', + waitNot: '.popover.tour', element: 'a[data-action=show-mobile-preview]', placement: 'bottom', title: "Test Your Mobile Version", content: "Let's check how your homepage looks like on mobile devices.", template: self.popover({ fixed: true }), - trigger: { - id: 'shown.bs.modal', - emitter: $(document), - }, }, { - stepId: 'show-mobile-close', element: 'button[data-dismiss=modal]', placement: 'right', title: "Close Mobile Preview", content: "Scroll in the mobile preview to test the rendering. Once it's ok, close this dialog.", - trigger: 'click', }, { - stepId: 'show-tutorials', - element: '#help-menu-button', - placement: 'left', - title: "More Tutorials", - content: "Get more tutorials through this 'Help' menu or click on the left 'Edit' button to continue modifying this page.", - template: self.popover({ fixed: true, end: "Close Tutorial" }), - trigger: 'click', - } + waitNot: '.modal', + title: "Congrats", + content: "Congratulation. This tour is finished.", + template: self.popover({ fixed: true, next: "Close Tutorial" }), + }, ]; return this._super(); }, diff --git a/addons/website/static/src/js/website.tour.js b/addons/website/static/src/js/website.tour.js index 322bcc1545c..03a3cedfb75 100644 --- a/addons/website/static/src/js/website.tour.js +++ b/addons/website/static/src/js/website.tour.js @@ -1,531 +1,435 @@ (function () { 'use strict'; - var website = openerp.website; - website.add_template_file('/website/static/src/xml/website.tour.xml'); +var website = openerp.website; +website.add_template_file('/website/static/src/xml/website.tour.xml'); - website.Tour = openerp.Class.extend({ - steps: [], // Override - tourStorage: window.localStorage, // FIXME: will break on iPad in private mode - init: function () { - this.tour = new Tour({ - name: this.id, - storage: this.tourStorage, - keyboard: false, - template: this.popover(), - onHide: function () { - window.scrollTo(0, 0); - } +website.EditorBar.include({ + tours: [], + start: function () { + // $('.tour-backdrop').click(function (e) { + // e.stopImmediatePropagation(); + // e.preventDefault(); + // }); + var self = this; + var menu = $('#help-menu'); + _.each(this.tours, function (tour) { + var $menuItem = $($.parseHTML('
    • '+tour.name+'
      • ')); + $menuItem.click(function () { + tour.reset(); + tour.trigger(); }); - this.registerSteps(); - }, - registerStep: function (step) { - var self = this; - step.tour = self; - step.title = openerp.qweb.render('website.tour_popover_title', { title: step.title }); - if (!step.element) { - step.orphan = true; + menu.append($menuItem); + }); + + this.waitRTEReady = false; + this.on('rte:called', this, function () {self.waitRTEReady = true; }); + this.on('rte:ready', this, function () {self.waitRTEReady = false;}); + + var res = this._super(); + website.Tour.waitReady.call(this, this.testRunning); + return res; + }, + registerTour: function (tour) { + website.Tour.add(tour); + this.tours.push(tour); + }, + testRunning: function () { + if (this.waitRTEReady) { + this.on('rte:ready', this, function () { + website.Tour.each(function () { + this.running(); + }); + }); + } else { + website.Tour.each(function () { + this.running(); + }); + } + } +}); + + +///////////////////////////////////////////////// + + +/* jQuery selector to match exact text inside an element + * :containsExact() - case insensitive + * :containsExactCase() - case sensitive + * :containsRegex() - set by user ( use: $(el).find(':containsRegex(/(red|blue|yellow)/gi)') ) + */ +$.extend($.expr[':'],{ + containsExact: function(a,i,m){ + return $.trim(a.innerHTML.toLowerCase()) === m[3].toLowerCase(); + }, + containsExactCase: function(a,i,m){ + return $.trim(a.innerHTML) === m[3]; + }, + // Note all escaped characters need to be double escaped + // inside of the containsRegex, so "\(" needs to be "\\(" + containsRegex: function(a,i,m){ + var regreg = /^\/((?:\\\/|[^\/])+)\/([mig]{0,3})$/, + reg = regreg.exec(m[3]); + return reg ? new RegExp(reg[1], reg[2]).test($.trim(a.innerHTML)) : false; + } +}); +$.ajaxSetup({ + beforeSend:function(){ + $.ajaxBusy = ($.ajaxBusy|0) + 1; + }, + complete:function(){ + $.ajaxBusy--; + } +}); + + +website.Tour = openerp.Class.extend({ + steps: [], + defaultDelay: 50, //ms + localStorage: window.localStorage, + init: function (url) { + this.tour = new Tour({ + name: this.id, + storage: this.tourStorage, + keyboard: false, + template: this.popover(), + onHide: function () { + window.scrollTo(0, 0); } + }); + this.registerSteps(); + }, + + run: function (automatic, force) { + if (force) this.reset(); + + for (var k in this.localStorage) { + if (!k.indexOf("tour-") && k.indexOf("-test") > -1) return; + } + + // only one test running + if (website.Tour.busy) return; + + website.Tour.busy = true; + this.localStorage.setItem("tour-"+this.id+"-test", 0); + + website.Tour.waitReady.call(this, function () {this._run(automatic, force);}); + }, + running: function () { + if (+this.localStorage.getItem("tour-"+this.id+"-test") >= this.steps.length) { + this.endTour(); + return; + } + + if (website.Tour.busy || !this.testUrl()) return; + + var self = this; + website.Tour.waitReady.call(this, function () { + self._running(); + }, 500); + }, + + _run: function (automatic, force) { + this.reset(); + this.localStorage.setItem("tour-"+this.id+"-test", 0); + if (automatic) { + this.localStorage.setItem("tour-"+this.id+"-test-automatic", true); + } + this.nextStep(null, automatic ? this.autoNextStep : null, automatic ? 5000 : null); + }, + _running: function () { + var stepId = this.localStorage.getItem("tour-"+this.id+"-test"); + var automatic = !!this.localStorage.getItem("tour-"+this.id+"-test-automatic"); + + if (stepId || this.checkRuningUrl()) { + + if (!this.check(this.step(stepId))) { + var step = this.next(stepId); + stepId = step ? step.stepId : stepId; + } + website.Tour.busy = true; + this.nextStep(stepId, automatic ? this.autoNextStep : null, automatic ? 5000 : null); + } + }, + + reset: function () { + website.Tour.busy = false; + for (var k in this.steps) { + this.steps[k].busy = false; + } + clearTimeout(self.timer); + clearTimeout(self.testtimer); + + for (var k in this.localStorage) { + if (!k.indexOf("tour-") || !k.indexOf(this.id)) { + this.localStorage.removeItem(k); + } + } + + $('.popover.tour').remove(); + }, + trigger: function (automatic) { + if (this.path) { + this.localStorage.setItem("tour-"+this.id+"-test", 0); + if (automatic) this.localStorage.setItem("tour-"+this.id+"-test-automatic", true); + var path = this.path.split('?'); + window.location.href = path[0] + "?tutorial."+this.id+"=true" + path.slice(1, path.length).join("?"); + } else { + this.run(automatic); + } + }, + testUrl: function () { + return !this.testPath || this.testPath.test(window.location.href); + }, + checkRuningUrl: function () { + return window.location.search.indexOf("tutorial."+this.id+"=true") > -1; + }, + + registerSteps: function () { + for (var index=0, len=this.steps.length; index 0 && $(this.steps[index-1].template).has("button[data-role='next']").size()) { + step.waitNot = '.popover.tour'; + } + if (!step.waitFor && index > 0 && this.steps[index-1].snippet) { + step.waitFor = '.oe_overlay_options .oe_options:visible'; + } + + step._title = step.title; + step.title = openerp.qweb.render('website.tour_popover_title', { title: step.title }); + if (!step.element) step.orphan = true; if (step.snippet) { step.element = '#oe_snippets div.oe_snippet[data-snippet-id="'+step.snippet+'"] .oe_snippet_thumbnail'; } - if (step.trigger) { - if (step.trigger === 'click') { - step.triggers = function (callback) { - $(step.element).one('click', function () { - (callback || self.moveToNextStep).apply(self); - }); - }; - } else if (step.trigger === 'reload') { - step.triggers = function (callback) { - var stack = JSON.parse(step.tour.tourStorage.getItem("website-reloads")) || []; - var index = stack.indexOf(step.stepId); - if (index !== -1) { - setTimeout(function () { - $(step.element).popover("destroy"); - setTimeout(function () { - stack.splice(index,1); - (callback || self.moveToNextStep).apply(self); - step.tour.tourStorage.setItem("website-reloads", JSON.stringify(stack)); - },10); - },0); - } else { - stack.push(step.stepId); - step.tour.tourStorage.setItem("website-reloads", JSON.stringify(stack)); - } - }; - } else if (step.trigger === 'drag') { - step.triggers = function (callback) { - self.onSnippetDragged(callback || self.moveToNextStep); - }; - } else if (step.trigger.id) { - if (step.trigger.emitter && step.trigger.type === 'openerp') { - step.triggers = function (callback) { - step.trigger.emitter.on(step.trigger.id, self, function customHandler () { - step.trigger.emitter.off(step.trigger.id, customHandler); - (callback || self.moveToNextStep).apply(self, arguments); - }); - }; - } else { - step.triggers = function (callback) { - var emitter = _.isString(step.trigger.emitter) ? $(step.trigger.emitter) : (step.trigger.emitter || $(step.element)); - if (!emitter.size()) throw "Emitter is undefined"; - emitter.on(step.trigger.id, function () { - (callback || self.moveToNextStep).apply(self, arguments); - }); - }; - } - } else if (step.trigger.url) { - step.triggers = function (callback) { - var stack = JSON.parse(step.tour.tourStorage.getItem("website-geturls")) || []; - var id = step.trigger.url.toString(); - var index = stack.indexOf(id); - if (index !== -1) { - var url = new website.UrlParser(window.location.href); - var test = typeof step.trigger.url === "string" ? - step.trigger.url == url.pathname+url.search : - step.trigger.url.test(url.pathname+url.search); - if (!test) return; - setTimeout(function () { - $(step.element).popover("destroy"); - setTimeout(function () { - stack.splice(index,1); - (callback || self.moveToNextStep).apply(self); - step.tour.tourStorage.setItem("website-geturls", JSON.stringify(stack)); - },10); - },0); - } else { - stack.push(id); - step.tour.tourStorage.setItem("website-geturls", JSON.stringify(stack)); - } - return index !== -1; - }; - } else if (step.trigger.modal) { - step.triggers = function (callback, auto) { - var $doc = $(document); - function onStop () { - if (step.trigger.modal.stopOnClose) { - self.stop(); - } - } - $doc.on('hide.bs.modal', onStop); - $doc.one('shown.bs.modal', function () { - $('.modal button.btn-primary').one('click', function () { - $doc.off('hide.bs.modal', onStop); - if (!callback) { - self.moveToStep(step.trigger.modal.afterSubmit); - } - }); - (callback || self.moveToNextStep).apply(self); - }); - }; - } else if (step.trigger === 'ajax') { - step.triggers = function (callback) { - $( document ).ajaxSuccess(function(event, xhr, settings) { - $( document ).unbind('ajaxSuccess'); - xhr.then(function () { - setTimeout(function () { - $(step.element).popover("destroy"); - setTimeout(function () { - (callback || self.moveToNextStep).apply(self); - },10); - },0); - }); - }); - }; - } else { - step.triggers = function (callback) { - var emitter = $(step.element); - if (!emitter.size()) throw "Emitter is undefined"; - var trigger = function () { - emitter.off(step.trigger, trigger); - (callback || self.moveToNextStep).apply(self, arguments); - }; - emitter.on(step.trigger, trigger); - }; - } - } - step.onShow = (function () { - var executed = false; - return function () { - if (!executed) { - _.isFunction(step.onStart) && step.onStart(); - _.isFunction(step.triggers) && step.triggers(); - executed = true; - } - }; - }()); - return step; - }, - registerSteps: function () { - var self = this; - this.tour.addSteps(_.map(this.steps, function (step) { - return self.registerStep(step); - })); - }, - reset: function () { - this.tourStorage.removeItem(this.id+'_current_step'); - this.tourStorage.removeItem(this.id+'_end'); - this.tourStorage.removeItem("website-reloads"); - this.tourStorage.removeItem("website-geturls"); - this.tour._current = 0; - $('.popover.tour').remove(); - }, - start: function () { - window.Tour.prototype._isOrphan = function(step) { - return (step.element == null) || !$(step.element).length; - }; - if (this.resume() || ((this.currentStepIndex() === 0) && !this.tour.ended())) { - this.tour.start(); - } - }, - currentStepIndex: function () { - var index = this.tourStorage.getItem(this.id+'_current_step') || 0; - return parseInt(index, 10); - }, - indexOfStep: function (stepId) { - var index = -1; - _.each(this.steps, function (step, i) { - if (step.stepId === stepId) { - index = i; - } - }); - return index; - }, - isCurrentStep: function (stepId) { - return this.currentStepIndex() === this.indexOfStep(stepId); - }, - moveToStep: function (step) { - var index = _.isNumber(step) ? step : this.indexOfStep(step); - if (index >= this.steps.length) { - this.stop(); - } else if (index >= 0) { - var self = this; - $('.popover.tour').remove(); - self.tour.goto(index); - } - }, - moveToNextStep: function () { - var nextStepIndex = this.currentStepIndex() + 1; - this.moveToStep(nextStepIndex); - }, - stop: function () { - this.tour.end(); - }, - redirect: function (url) { - url = url || new website.UrlParser(window.location.href); - var path = (this.path && url.pathname !== this.path) ? this.path : url.pathname; - var search = url.activateTutorial(this.id); - var newUrl = path + search; - window.location.replace(newUrl); - }, - ended: function () { - return this.tourStorage.getItem(this.id+'_end') === "yes"; - }, - resume: function () { - // Override if necessary - return this.tourStorage.getItem(this.id+'_current_step') && !this.ended(); - }, - trigger: function (url) { - // Override if necessary - url = url || new website.UrlParser(window.location.href); - return url.isActive(this.id); - }, - testUrl: function (pattern) { - var url = new website.UrlParser(window.location.href); - return pattern.test(url.pathname+url.search); - }, - popover: function (options) { - return openerp.qweb.render('website.tour_popover', options); - }, - onSnippetDragged: function (callback) { - var self = this; - var selector = '#website-top-navbar [data-snippet-id].ui-draggable'; - var beginDrag = function beginDrag () { - $('.popover.tour').remove(); - var advance = function advance () { - if (_.isFunction(callback)) { - callback.apply(self); - } - $(selector).off('mouseup', advance); - }; - $(document.body).one('mouseup', advance); - $(selector).off('mousedown', beginDrag); - }; - $(selector).one('mousedown', beginDrag); - }, - onSnippetDraggedAdvance: function () { - onSnippetDragged(self.moveToNextStep); - }, - }); - website.UrlParser = openerp.Class.extend({ - init: function (url) { - var a = document.createElement('a'); - a.href = url; - this.href = a.href; - this.host = a.host; - this.protocol = a.protocol; - this.port = a.port; - this.hostname = a.hostname; - this.pathname = a.pathname; - this.origin = a.origin; - this.search = a.search; - this.hash = a.hash; - function generateTrigger (id) { - return "tutorial."+id+"=true"; - } - this.activateTutorial = function (id) { - var urlTrigger = generateTrigger(id); - var querystring = _.filter(this.search.split('?'), function (str) { - return str; - }); - if (querystring.length > 0) { - var queries = _.filter(querystring[0].split("&"), function (query) { - return query.indexOf("tutorial.") < 0 - }); - queries.push(urlTrigger); - return "?"+_.uniq(queries).join("&"); - } else { - return "?"+urlTrigger; - } - }; - this.isActive = function (id) { - var urlTrigger = generateTrigger(id); - return this.search.indexOf(urlTrigger) >= 0; - }; - }, - }); + } - var TestConsole = openerp.Class.extend({ - tests: [], - editor: null, - init: function (editor) { - if (!editor) { - throw new Error("Editor cannot be null or undefined"); - } - this.editor = editor; - }, - test: function (id) { - return _.find(this.tests, function (tour) { - return tour.id === id; + if ($(this.steps[index-1].template).has("button[data-role='next']")) { + var step = { + stepId: index, + waitNot: '.popover.tour:visible' + }; + this.steps.push(step); + } + + this.tour.addSteps(this.steps); + }, + + popover: function (options) { + return openerp.qweb.render('website.tour_popover', options); + }, + + timer: null, + testtimer: null, + check: function (step) { + return (step && + (!step.element || ($(step.element).size() && $(step.element).is(":visible") && !$(step.element).is(":hidden"))) && + (!step.waitNot || !$(step.waitNot).size()) && + (!step.waitFor || $(step.waitFor).size())); + }, + waitNextStep: function (step, callback, overlaps) { + var self = this; + var time = new Date().getTime(); + var timer; + + window.onbeforeunload = function () { + clearTimeout(self.timer); + clearTimeout(self.testtimer); + }; + + // check popover activity + $(".popover.tour button") + .off() + .on("click", function () { + $(".popover.tour").remove(); + if (step.busy) return; + if (!$(this).is("[data-role='next']")) { + clearTimeout(self.timer); + step.busy = true; + self.tour.end(); + self.endTour(callback); + } }); - }, - snippetSelector: function (snippetId) { - return '#oe_snippets div.oe_snippet[data-snippet-id="'+snippetId+'"] .oe_snippet_thumbnail'; - }, - snippetThumbnail: function (snippetId) { - return $(this.snippetSelector(snippetId)).first(); - }, - snippetThumbnailExists: function (snippetId) { - return this.snippetThumbnail(snippetId).length > 0; - }, - dragAndDropSnippet: function (snippetId) { - function actualDragAndDrop ($thumbnail) { - var thumbnailPosition = $thumbnail.position(); - $thumbnail.trigger($.Event("mousedown", { which: 1, pageX: thumbnailPosition.left, pageY: thumbnailPosition.top })); - $thumbnail.trigger($.Event("mousemove", { which: 1, pageX: document.body.scrollWidth/2, pageY: document.body.scrollHeight/2 })); - var $dropZone = $(".oe_drop_zone").first(); - var dropPosition = $dropZone.position(); - $dropZone.trigger($.Event("mouseup", { which: 1, pageX: dropPosition.left, pageY: dropPosition.top })); - } - if (this.snippetThumbnailExists(snippetId)) { - actualDragAndDrop(this.snippetThumbnail(snippetId)); + + function checkNext () { + clearTimeout(self.timer); + if (step.busy) return; + if (self.check(step)) { + step.busy = true; + // use an other timeout for cke dom loading + setTimeout(function () { + self.nextStep(step.stepId, callback, overlaps); + }, self.defaultDelay); + } else if (!overlaps || new Date().getTime() - time < overlaps) { + self.timer = setTimeout(checkNext, self.defaultDelay); } else { - this.editor.on('rte:ready', this, function () { - actualDragAndDrop(this.snippetThumbnail(snippetId)); - }); + self.reset(); + throw new Error("Time overlaps to arrive to step " + step.stepId + ": '" + step._title + "'"); } - }, - }); + } + checkNext(); + }, + step: function (stepId) { + var steps = this.steps.slice(0,this.steps.length), + step; + while (step = steps.shift()) { + if (!stepId || step.stepId === stepId) + return step; + } + return null; + }, + next: function (stepId) { + var steps = this.steps.slice(0,this.steps.length), + step, next, index=0; + while (step = steps.shift()) { + if (!stepId || step.stepId === stepId) { + // clear popover (fix for boostrap tour if the element is removed before destroy popover) + $(".popover.tour").remove(); + // go to step in bootstrap tour + this.tour.goto(index); + if (step.callback) step.callback(); + next = steps.shift(); + break; + } + index++; + } + return next; + }, + nextStep: function (stepId, callback, overlaps) { + var self = this; + if (!this.localStorage.getItem("tour-"+this.id+"-test")) return; + this.localStorage.setItem("tour-"+this.id+"-test", stepId || 0); - website.EditorBar.include({ - tours: [], - init: function () { - var result = this._super(); - website.TestConsole = new TestConsole(this); - return result; - }, - start: function () { - $('.tour-backdrop').click(function (e) { - e.stopImmediatePropagation(); - e.preventDefault(); - }); - var menu = $('#help-menu'); - _.each(this.tours, function (tour) { - var $menuItem = $($.parseHTML('
    • '+tour.name+'
      • ')); - $menuItem.click(function () { - tour.reset(); - tour.redirect(new website.UrlParser(window.location.href)); - }); - menu.append($menuItem); - if (tour.trigger()) { - setTimeout(function () { - setTimeout(function () { - tour.start(); - },100); - },0); + this.current = this.step(stepId); + var next = this.next(stepId); + + if (next) { + setTimeout(function () { + self.waitNextStep(next, callback, overlaps); + if (callback) setTimeout(function(){callback.call(self, next);}, self.defaultDelay); + }, next && next.wait || 0); + } else { + this.endTour(); + } + }, + endTour: function () { + console.log('{ "event": "success" }'); + this.reset(); + }, + autoNextStep: function () { + var self = this; + clearTimeout(self.testtimer); + + function autoStep () { + var step = self.current; + if (!step) return; + + if (step.autoComplete) { + step.autoComplete(tour); + } + + var $popover = $(".popover.tour"); + if ($popover.find("button[data-role='next']:visible").size()) { + $popover.find("button[data-role='next']:visible").click(); + $popover.remove(); + } + + var $element = $(step.element); + if (!$element.size()) return; + + if (step.snippet) { + + var selector = '#oe_snippets div.oe_snippet[data-snippet-id="'+step.snippet+'"] .oe_snippet_thumbnail'; + self.autoDragAndDropSnippet(selector); + + } else if (step.element.match(/#oe_snippets .* \.oe_snippet_thumbnail/)) { + + self.autoDragAndDropSnippet($element); + + } else if (step.sampleText) { + + $element.trigger($.Event("keydown", { srcElement: $element })); + if ($element.is("select") || $element.is("input") ) { + $element.val(step.sampleText); + } else { + $element.html(step.sampleText); } - }); - return this._super(); - }, - registerTour: function (tour) { - var self = this; - var testId = 'test_'+tour.id+'_tour'; - this.tours.push(tour); - var defaultDelay = 250; //ms - var overlapsCrash; - var test = { - id: tour.id, - run: function (force) { - if (force === true) { - this.reset(); - tour.reset(); - } - var actionSteps = _.filter(tour.steps, function (step) { - return step.trigger || step.triggers || step.sampleText; - }); - window.onbeforeunload = function () { - clearTimeout(overlapsCrash); - }; - function throwError (message) { - console.log(tour.tourStorage.getItem("test-report")); - test.reset(); - tour.reset(); - throw message; - } - function initReport () { - // set last time for report - if (!tour.tourStorage.getItem("test-last-time")) { - tour.tourStorage.setItem("test-last-time", new Date().getTime()); - } - } - function setReport (step) { - var report = JSON.parse(tour.tourStorage.getItem("test-report")) || {}; - report[step.stepId] = (new Date().getTime() - tour.tourStorage.getItem("test-last-time")) + " ms"; - tour.tourStorage.setItem("test-report", JSON.stringify(report)); - } - function testCycling (step) { - var lastStep = tour.tourStorage.getItem(testId); - var tryStep = lastStep != step.stepId ? 0 : (+(tour.tourStorage.getItem("test-last-"+testId) || 0) + 1); - tour.tourStorage.setItem("test-last-"+testId, tryStep); - if (tryStep > 2) { - throwError("Test: '" + testId + "' cycling step: '" + step.stepId + "'"); - } - return tryStep; - } - function getDelay (step) { - return step.delay || defaultDelay; - } - function executeStep (step) { - if (testCycling(step) === 0) initReport(); + setTimeout(function () { + $element.trigger($.Event("keyup", { srcElement: $element })); + $element.trigger($.Event("change", { srcElement: $element })); + }, self.defaultDelay<<1); + + } else if ($element.is(":visible")) { - tour.tourStorage.setItem(testId, step.stepId); + $element.trigger($.Event("mouseenter", { srcElement: $element[0] })); + $element.trigger($.Event("mousedown", { srcElement: $element[0] })); + + var evt = document.createEvent("MouseEvents"); + evt.initMouseEvent("click", true, true, window, 0, 0, 0, 0, 0, false, false, false, false, 0, null); + $element[0].dispatchEvent(evt); - var delay = getDelay (step); - - overlapsCrash = setTimeout(function () { - throwError("Test: '" + testId + "' can't resolve step: '" + step.stepId + "'"); - }, delay + 3000); - - - var _next = false; - tour.tourStorage.setItem(testId, step.stepId); - function next () { - _next = true; - clearTimeout(overlapsCrash); - - setReport(step); - - var nextStep = actionSteps.shift(); - - if (nextStep) { - executeStep(nextStep); - } else { - tour.tourStorage.removeItem(testId); - } - } - - setTimeout(function () { - var $element = $(step.element); - - var flag = step.triggers && (!step.trigger || !step.trigger.modal); - if (flag) { - try { - step.triggers(next, true); - } catch (e) { - throwError(e); - } - } - if ((step.trigger === 'reload' || (step.trigger && step.trigger.url)) && _next) return; - - if (step.snippet && step.trigger === 'drag') { - website.TestConsole.dragAndDropSnippet(step.snippet); - } else if (step.trigger && step.trigger.id === 'change') { - $element.trigger($.Event("change", { srcElement: $element })); - } else if (step.sampleText) { - $element.trigger($.Event("keydown", { srcElement: $element })); - if ($element.is("select") || $element.is("input") ) { - $element.val(step.sampleText); - } else { - $element.html(step.sampleText); - } - $element.trigger($.Event("change", { srcElement: $element })); - $element.trigger($.Event("keyup", { srcElement: $element })); - } else if ($element.is(":visible")) { // Click by default - $element.trigger($.Event("mouseenter", { srcElement: $element })); - $element.trigger($.Event("mousedown", { srcElement: $element })); - var evt = document.createEvent("MouseEvents"); - evt.initMouseEvent("click", true, true, window, 0, 0, 0, 0, 0, false, false, false, false, 0, null); - $element[0].dispatchEvent(evt); - $element.trigger($.Event("mouseup", { srcElement: $element })); - $element.trigger($.Event("mouseleave", { srcElement: $element })); - - // trigger after for step like: mouseenter, next step click on button display with mouseenter - $element.trigger($.Event("mouseenter", { srcElement: $element })); - } - if (!flag) next(); - },delay); - } - var url = new website.UrlParser(window.location.href); - if (tour.path && url.pathname !== tour.path && !tour.tourStorage.getItem(testId)) { - tour.tourStorage.setItem(testId, actionSteps[0].stepId); - window.location.href = tour.path; - } else { - var lastStepId = tour.tourStorage.getItem(testId); - var currentStep = actionSteps.shift(); - if (lastStepId) { - while (currentStep && lastStepId !== currentStep.stepId) { - currentStep = actionSteps.shift(); - } - } - if (currentStep.snippet && $(currentStep.element).length === 0) { - self.on('rte:ready', this, function () { - executeStep(currentStep); - }); - } else { - setTimeout(function () { - executeStep(currentStep); - }, 500); - } - } - }, - reset: function () { - tour.tourStorage.removeItem(testId); - tour.tourStorage.removeItem("test-report"); - for (var k in tour.tourStorage) { - if (tour.tourStorage[k].indexOf("test-last")) { - tour.tourStorage.removeItem(k); - } - } - }, - }; - website.TestConsole.tests.push(test); - if (window.localStorage.getItem(testId)) { - test.run(); + // trigger after for step like: mouseenter, next step click on button display with mouseenter + setTimeout(function () { + $element.trigger($.Event("mouseup", { srcElement: $element[0] })); + $element.trigger($.Event("mouseleave", { srcElement: $element[0] })); + }, 1000); } - }, + } + self.testtimer = setTimeout(autoStep, 100); + }, + autoDragAndDropSnippet: function (selector) { + var $thumbnail = $(selector).first(); + var thumbnailPosition = $thumbnail.position(); + $thumbnail.trigger($.Event("mousedown", { which: 1, pageX: thumbnailPosition.left, pageY: thumbnailPosition.top })); + $thumbnail.trigger($.Event("mousemove", { which: 1, pageX: document.body.scrollWidth/2, pageY: document.body.scrollHeight/2 })); + var $dropZone = $(".oe_drop_zone").first(); + var dropPosition = $dropZone.position(); + $dropZone.trigger($.Event("mouseup", { which: 1, pageX: dropPosition.left, pageY: dropPosition.top })); + }, + +}); + + +website.Tour.tours = {}; +website.Tour.busy = false; +website.Tour.add = function (tour) { + website.Tour.waitReady(function () { + tour = tour.id ? tour : new tour(); + website.Tour.tours[tour.id] = tour; }); +}; +website.Tour.get = function (id) { + return website.Tour.tours[id]; +}; +website.Tour.each = function (callback) { + website.Tour.waitReady(function () { + for (var k in website.Tour.tours) { + callback.call(website.Tour.tours[k]); + } + }); +}; +website.Tour.waitReady = function (callback) { + var self = this; + $(document).ready(function () { + if ($.ajaxBusy == null || $.ajaxBusy) { + $(document).ajaxStop(function() { + setTimeout(function () { + callback.call(self); + },0); + }); + } + else { + setTimeout(function () { + callback.call(self); + },0); + } + }); +}; + + + }()); diff --git a/addons/website/tests/ui_suite/homepage_test.js b/addons/website/tests/ui_suite/homepage_test.js index c83ab12ce2f..16634c80d8c 100644 --- a/addons/website/tests/ui_suite/homepage_test.js +++ b/addons/website/tests/ui_suite/homepage_test.js @@ -7,9 +7,8 @@ testRunner.run(function homepageTest (page, timeout) { waitFor(function clientReady () { return page.evaluate(function () { return window.$ && window.openerp && window.openerp.website - && window.openerp.website.TestConsole - && window.openerp.website.TestConsole.test - && window.openerp.website.TestConsole.test('banner'); + && window.openerp.website.Tour + && window.openerp.website.Tour.get('banner'); }); }, function executeTest () { var before = page.evaluate(function () { @@ -17,7 +16,7 @@ testRunner.run(function homepageTest (page, timeout) { carousel: $('#wrap [data-snippet-id=carousel]').length, columns: $('#wrap [data-snippet-id=three-columns]').length, }; - window.openerp.website.TestConsole.test('banner').run(true); + window.openerp.website.Tour.get('banner').run(true, true); return result; }); waitFor(function testExecuted () { diff --git a/addons/website_blog/static/src/js/website.tour.blog.js b/addons/website_blog/static/src/js/website.tour.blog.js index 2f9d3b5cde0..5e7a7888b89 100644 --- a/addons/website_blog/static/src/js/website.tour.blog.js +++ b/addons/website_blog/static/src/js/website.tour.blog.js @@ -13,148 +13,107 @@ website.BlogTour = website.Tour.extend({ id: 'blog', name: "Create a blog post", + testPath: /\/blogpost\/[0-9]+\//, init: function (editor) { var self = this; self.steps = [ { - stepId: 'welcome-blog', title: "New Blog Post", content: "Let's go through the first steps to write beautiful blog posts.", template: self.popover({ next: "Start Tutorial", end: "Skip" }), - backdrop: true, }, { - stepId: 'content-menu', element: '#content-menu-button', placement: 'left', title: "Add Content", content: "Create new pages, blogs, menu items and products through the 'Content' menu.", template: self.popover({ fixed: true }), - trigger: 'click', }, { - stepId: 'new-post-entry', element: 'a[data-action=new_blog_post]', placement: 'left', title: "New Blog Post", content: "Select this menu item to create a new blog post.", template: self.popover({ fixed: true }), - trigger: { - modal: { - stopOnClose: true, - afterSubmit: 'post-page', - }, - }, }, { - stepId: 'continue-blog', element: '.modal button.btn-primary', placement: 'bottom', title: "Create Blog Post", content: "Click Continue to create the blog post.", - trigger: { - url: /blogpost\/[0-9]+\/.*/, - }, }, { - stepId: 'post-page', + waitNot: '.modal', title: "Blog Post Created", content: "This is your new blog post. Let's edit it.", template: self.popover({ next: "Continue" }), }, { - stepId: 'post-title', element: 'h1[data-oe-expression="blog_post.name"]', placement: 'bottom', + sampleText: 'New Blog', title: "Set a Title", content: "Click on this area and set a catchy title for your blog post.", - template: self.popover({ next: "Continue" }), }, { - stepId: 'add-image-text', + waitNot: '#wrap h1[data-oe-model="blog.post"]:contains("Blog Post Title")', element: 'button[data-action=snippet]', placement: 'bottom', title: "Layout Your Blog Post", content: "Use well designed building blocks to structure the content of your blog. Click 'Insert Blocks' to add new content.", template: self.popover({ fixed: true }), - trigger: 'click', }, { - stepId: 'drag-image-text', snippet: 'image-text', placement: 'bottom', title: "Drag & Drop a Block", content: "Drag the 'Image-Text' block and drop it in your page.", template: self.popover({ fixed: true }), - trigger: 'drag', }, { - stepId: 'add-text-block', element: 'button[data-action=snippet]', placement: 'bottom', title: "Add Another Block", content: "Let's add another block to your post.", template: self.popover({ fixed: true }), - trigger: 'click', }, { - stepId: 'drag-text-block', snippet: 'text-block', placement: 'bottom', title: "Drag & Drop a block", content: "Drag the 'Text Block' block and drop it below the image block.", template: self.popover({ fixed: true }), - trigger: 'drag', }, { - stepId: 'activate-text-block-title', - element: '#wrap [data-snippet-id=text-block] .text-center[data-snippet-id=colmd]', - placement: 'top', - title: "Edit an Area", - content: "Select any area of the page to modify it. Click on this subtitle.", - trigger: { - id: 'snippet-activated', - } - }, - { - stepId: 'remove-text-block-title', element: '.oe_active .oe_snippet_remove', placement: 'top', title: "Delete the Title", content: "From this toolbar you can move, duplicate or delete the selected zone. Click on the garbage can image to delete the title.", - trigger: 'click', }, { - stepId: 'save-changes', + waitNot: '.oe_active .oe_snippet_remove:visible', element: 'button[data-action=save]', placement: 'right', title: "Save Your Blog", content: "Click the Save button to record changes on the page.", template: self.popover({ fixed: true }), - trigger: 'reload', }, { - stepId: 'publish-post', + waitFor: 'button[data-action=edit]:visible', element: 'button.btn-danger.js_publish_btn', placement: 'top', title: "Publish Your Post", content: "Your blog post is not yet published. You can update this draft version and publish it once you are ready.", - trigger: 'click', - delay: 5000, }, { - stepId: 'end-tutorial', + waitFor: '.js_publish_management button.js_publish_btn.btn-success:visible', title: "Thanks!", content: "This tutorial is finished. To discover more features, improve the content of this page and try the Promote button in the top right menu.", template: self.popover({ end: "Close Tutorial" }), - backdrop: true, }, ]; return this._super(); }, - trigger: function () { - return (this.resume() && this.testUrl(/^\/blogpost\/[0-9]+\//)) || this._super(); - }, }); }()); diff --git a/addons/website_blog/tests/ui_suite/post_test.js b/addons/website_blog/tests/ui_suite/post_test.js index a3677bfa974..b8cd8aa03da 100644 --- a/addons/website_blog/tests/ui_suite/post_test.js +++ b/addons/website_blog/tests/ui_suite/post_test.js @@ -7,12 +7,12 @@ testRunner.run(function blogTest (page, timeout) { waitFor(function clientReady () { return page.evaluate(function () { return window.$ && window.openerp && window.openerp.website - && window.openerp.website.TestConsole - && window.openerp.website.TestConsole.test('blog'); + && window.openerp.website.Tour + && window.openerp.website.Tour.get('blog'); }); }, function executeTest () { page.evaluate(function () { - window.openerp.website.TestConsole.test('blog').run(true); + window.openerp.website.Tour.test('blog').run(true, true); }); waitFor(function testExecuted () { var after = page.evaluate(function () { diff --git a/addons/website_event/static/src/js/website.tour.event.js b/addons/website_event/static/src/js/website.tour.event.js index 29f14cc2d7a..c449c4209d1 100644 --- a/addons/website_event/static/src/js/website.tour.event.js +++ b/addons/website_event/static/src/js/website.tour.event.js @@ -13,161 +13,105 @@ website.EventTour = website.Tour.extend({ id: 'event', name: "Create an event", + testPath: /\/event\/[0-9]+\/register/, init: function (editor) { var self = this; self.steps = [ { - stepId: 'welcome-event', title: "Create an Event", content: "Let's go through the first steps to publish a new event.", template: self.popover({ next: "Start Tutorial", end: "Skip It" }), - backdrop: true, }, { - stepId: 'content-menu', element: '#content-menu-button', placement: 'left', title: "Add Content", content: "The Content menu allows you to create new pages, events, menus, etc.", template: self.popover({ fixed: true }), - trigger: 'click', }, { - stepId: 'new-post-entry', element: 'a[data-action=new_event]', placement: 'left', title: "New Event", content: "Click here to create a new event.", template: self.popover({ fixed: true }), - trigger: { - modal: { - stopOnClose: true, - }, - }, }, { - stepId: 'choose-name', - element: '.modal input', + element: '.modal:contains("New Event") input[type=text]', sampleText: 'Advanced Technical Training', placement: 'right', title: "Create an Event Name", content: "Create a name for your new event and click 'Continue'. e.g: Technical Training", - trigger: 'keyup', }, { - stepId: 'continue-name', + waitNot: '.modal input[type=text]:not([value!=""])', element: '.modal button.btn-primary', placement: 'right', title: "Create Event", content: "Click Continue to create the event.", - trigger: 'reload', }, { - stepId: 'event-page', + waitFor: '#website-top-navbar button[data-action="save"]:visible', title: "New Event Created", content: "This is your new event page. We will edit the event presentation page.", - template: self.popover({ next: "OK" }), + template: self.popover({ next: "Continue" }), }, { - stepId: 'add-banner', element: 'button[data-action=snippet]', placement: 'bottom', title: "Layout your event", content: "Insert blocks to layout the body of your event.", template: self.popover({ fixed: true }), - trigger: 'click', }, { - stepId: 'drag-banner', snippet: 'image-text', placement: 'bottom', title: "Drag & Drop a block", content: "Drag the 'Image-Text' block and drop it in your page.", template: self.popover({ fixed: true }), - trigger: 'drag', }, { - stepId: 'add-text-block', + element: 'button[data-action=snippet]', placement: 'bottom', title: "Layout your event", content: "Insert another block to your event.", template: self.popover({ fixed: true }), - trigger: 'click', }, { - stepId: 'drag-text-block', snippet: 'text-block', placement: 'bottom', title: "Drag & Drop a block", content: "Drag the 'Text Block' in your event page.", template: self.popover({ fixed: true }), - trigger: 'drag', }, { - stepId: 'add-three-columns', - element: 'button[data-action=snippet]', - placement: 'bottom', - title: "Layout your event", - content: "Insert a last block to your event.", - template: self.popover({ fixed: true }), - trigger: 'click', - }, - { - stepId: 'drag-three-columns', - snippet: 'three-columns', - placement: 'bottom', - title: "Drag & Drop a block", - content: "Drag the 'Three Columns' block at the bottom.", - template: self.popover({ fixed: true }), - trigger: 'drag', - }, - { - stepId: 'save-changes', element: 'button[data-action=save]', placement: 'right', title: "Save your modifications", content: "Once you click on save, your event is updated.", template: self.popover({ fixed: true }), - trigger: 'reload', }, { - stepId: 'publish-event', + waitFor: 'button[data-action=edit]:visible', element: 'button.btn-danger.js_publish_btn', placement: 'top', title: "Publish your event", content: "Click to publish your event.", - trigger: 'ajax' }, { - stepId: 'customize-event', + waitFor: '.js_publish_management button.js_publish_btn.btn-success:visible', element: '.js_publish_management button[data-toggle="dropdown"]', placement: 'left', title: "Customize your event", content: "Click here to customize your event further.", - trigger: 'click', }, { - stepId: 'edit-event-backend', - element: '.js_publish_management ul>li>a:last', - placement: 'left', - title: "Customize your event", - content: "Click here to edit your event in the backend.", - trigger: 'click', - }, - { - stepId: 'end-tutorial', - title: "Thanks!", - content: "This tutorial is finished. Congratulations on creating your first event.", - template: self.popover({ end: "Close Tutorial" }), - backdrop: true, + element: '.js_publish_management ul>li>a:last:visible', }, ]; return this._super(); - }, - trigger: function () { - return (this.resume() && this.testUrl(/^\/event\/[0-9]+\/register/)) || this._super(); - }, + } }); }()); diff --git a/addons/website_event/tests/ui_suite/event_test.js b/addons/website_event/tests/ui_suite/event_test.js index e8022c764ec..0ec8a2783bb 100644 --- a/addons/website_event/tests/ui_suite/event_test.js +++ b/addons/website_event/tests/ui_suite/event_test.js @@ -7,12 +7,12 @@ testRunner.run(function eventTest (page, timeout) { waitFor(function clientReady () { return page.evaluate(function () { return window.$ && window.openerp && window.openerp.website - && window.openerp.website.TestConsole - && window.openerp.website.TestConsole.test('event'); + && window.openerp.website.Tour + && window.openerp.website.Tour.get('event'); }); }, function executeTest () { page.evaluate(function () { - window.openerp.website.TestConsole.test('event').run(true); + window.openerp.website.Tour.get('event').run(true, true) }); waitFor(function testExecuted () { var after = page.evaluate(function () { diff --git a/addons/website_sale/static/src/js/website.tour.shop.js b/addons/website_sale/static/src/js/website.tour.shop.js index 1104f40ad4f..340fe19c798 100644 --- a/addons/website_sale/static/src/js/website.tour.shop.js +++ b/addons/website_sale/static/src/js/website.tour.shop.js @@ -7,7 +7,6 @@ start: function () { this.registerTour(new website.EditorShopTour(this)); var res = this._super(); - this.registerTour(new website.EditorShopTest(this)); return res; }, }); @@ -15,314 +14,233 @@ website.EditorShopTour = website.Tour.extend({ id: 'shop', name: "Create a product", + testPath: /\/shop\/.*/, init: function (editor) { var self = this; self.steps = [ { - stepId: 'welcome-shop', title: "Welcome to your shop", content: "You successfully installed the e-commerce. This guide will help you to create your product and promote your sales.", template: self.popover({ next: "Start Tutorial", end: "Skip It" }), - backdrop: true, }, { - stepId: 'content-menu', element: '#content-menu-button', placement: 'left', title: "Create your first product", content: "Click here to add a new product.", template: self.popover({ fixed: true }), - trigger: 'click', }, { - stepId: 'edit-entry', - element: '#create-new-product', + element: 'a[data-action=new_product]', placement: 'left', title: "Create a new product", content: "Select 'New Product' to create it and manage its properties to boost your sales.", template: self.popover({ fixed: true }), - trigger: { - modal: { - stopOnClose: true, - }, - }, }, { - stepId: 'enter-name', - element: '.modal input[type=text]', + element: '.modal:contains("New Product") input[type=text]', sampleText: 'New Product', placement: 'right', title: "Choose name", content: "Enter a name for your new product then click 'Continue'.", - trigger: 'keyup', }, { - stepId: 'continue-name', + waitNot: '.modal input[type=text]:not([value!=""])', element: '.modal button.btn-primary', placement: 'right', title: "Create Product", content: "Click Continue to create the product.", - trigger: 'reload', }, { - stepId: 'product-page', + waitFor: '#website-top-navbar button[data-action="save"]:visible', title: "New product created", content: "This page contains all the information related to the new product.", - template: self.popover({ next: "OK" }), + template: self.popover({ next: "Continue" }), }, { - stepId: 'edit-price-cke', element: '.product_price .oe_currency_value', sampleText: '20.50', placement: 'left', title: "Change the price", content: "Edit the price of this product by clicking on the amount.", - template: self.popover({ next: "OK" }), }, { - stepId: 'update-image', + waitNot: '.product_price .oe_currency_value:containsExact(1.00)', element: '#wrap img.img:first', placement: 'top', title: "Update image", content: "Click here to set an image describing your product.", - triggers: function (callback) { - var self = this; - $(self.element).on('mouseenter', function () { - $(this).off('mouseenter'); - setTimeout(function () { - (callback || self.tour.moveToNextStep).apply(self.tour); - },0); - }); - }, }, { - stepId: 'update-image-button', element: 'button.hover-edition-button:visible', placement: 'top', title: "Update image", content: "Click here to set an image describing your product.", - trigger: 'click', }, { - stepId: 'upload-image', + wait: 500, element: '.well a.pull-right', placement: 'bottom', title: "Select an Image", content: "Let's select an existing image.", template: self.popover({ fixed: true }), - trigger: 'ajax' }, { - stepId: 'select-image', element: 'img[alt=imac]', placement: 'bottom', title: "Select an Image", content: "Let's select an imac image.", template: self.popover({ fixed: true }), - triggers: function (callback) { - var self = this; - var click = function () { - $('.modal-dialog.select-image img').off('click', click); - setTimeout(function () { - (callback || self.tour.moveToNextStep).apply(self.tour); - },0); - }; - $('.modal-dialog.select-image img').on('click', click); - }, }, { - stepId: 'save-image', - element: 'button.save', + waitNot: 'img[alt=imac]', + element: '.modal-content button.save', placement: 'bottom', title: "Select this Image", content: "Click to add the image to the product decsription.", template: self.popover({ fixed: true }), - trigger: 'click', }, { - stepId: 'add-block', + waitNot: '.modal-content:visible', element: 'button[data-action=snippet]', placement: 'bottom', title: "Describe the Product", content: "Insert blocks like text-image, or gallery to fully describe the product.", template: self.popover({ fixed: true }), - trigger: 'click', }, { - stepId: 'drag-big-picture', snippet: 'big-picture', placement: 'bottom', title: "Drag & Drop a block", content: "Drag the 'Big Picture' block and drop it in your page.", template: self.popover({ fixed: true }), - trigger: 'drag', }, { - stepId: 'save-changes', element: 'button[data-action=save]', placement: 'right', title: "Save your modifications", content: "Once you click on save, your product is updated.", template: self.popover({ fixed: true }), - trigger: 'reload', }, { - stepId: 'publish-product', + waitFor: '#website-top-navbar button[data-action="edit"]:visible', element: '.js_publish_management button.js_publish_btn.btn-danger', placement: 'top', title: "Publish your product", content: "Click to publish your product so your customers can see it.", - trigger: 'ajax' }, { - stepId: 'congratulations', + waitFor: '.js_publish_management button.js_publish_btn.btn-success:visible', title: "Congratulations", content: "Congratulations! You just created and published your first product.", - template: self.popover({ end: "Close Tutorial" }), - backdrop: true, + template: self.popover({ next: "Close Tutorial" }), }, ]; return this._super(); - }, - trigger: function () { - return (this.resume() && this.testUrl(/^\/shop\/product\/[0-9]+\//)) || this._super(); - }, - }); - - - website.Test = website.Tour.extend({ - registerStep: function (step) { - var self = this; - var step = this._super(step); - if (step.beforeTrigger || step.afterTrigger) { - var fn = step.triggers; - step.triggers = function (callback) { - if (step.beforeTrigger) step.beforeTrigger(self); - if (!step.afterTrigger) { - fn.call(step, callback); - } else { - fn.call(step, function () { - (callback || self.moveToNextStep).apply(self); - step.afterTrigger(self); - }); - } - }; - } - return step; } }); - - website.EditorShopTest = website.Test.extend({ - id: 'shop_buy_product', - name: "Try to buy products", - path: '/shop', - init: function (editor) { - var self = this; - self.steps = [ - { - stepId: 'begin-test', - title: 'begin-test', - template: self.popover({ next: "Start Test"}), - backdrop: true, - }, - { - stepId: 'display-ipod', - element: '.oe_product_cart a:contains("iPod")', - trigger: { - url: /shop\/product\/.*/, - }, - }, - { - stepId: 'choose-ipod', - element: 'input[name="product_id"]:not([checked])', - trigger: 'mouseup', - }, - { - stepId: 'add-ipod', - element: 'form[action="/shop/add_cart/"] button', - trigger: { - url: '/shop/mycart/', - }, - }, - { - stepId: 'add-suggested-product', - element: 'form[action="/shop/add_cart/"] button:contains("Add to Cart")', - trigger: 'reload', - }, - { - stepId: 'more-product', - element: '.oe_mycart a.js_add_cart_json:eq(1)', - trigger: 'ajax', - }, - { - stepId: 'less-product', - element: '.oe_mycart a.js_add_cart_json:eq(2)', - trigger: 'reload', - }, - { - stepId: 'number-product', - element: '.oe_mycart input.js_quantity', - sampleText: '1', - trigger: 'reload', - }, - { - stepId: 'go-checkout-product', - element: 'a[href="/shop/checkout/"]', - trigger: { - url: '/shop/checkout/', - }, - }, - { - stepId: 'confirm-false-checkout-product', - element: 'form[action="/shop/confirm_order/"] button', - trigger: { - url: '/shop/confirm_order/', - }, - beforeTrigger: function (tour) { - $("input[name='phone']").val(""); - }, - }, - { - stepId: 'confirm-checkout-product', - element: 'form[action="/shop/confirm_order/"] button', - trigger: { - url: '/shop/payment/', - }, - beforeTrigger: function (tour) { - if ($("input[name='name']").val() === "") - $("input[name='name']").val("website_sale-test-shoptest"); - if ($("input[name='email']").val() === "") - $("input[name='email']").val("website_sale-test-shoptest@website_sale-test-shoptest.optenerp.com"); - $("input[name='phone']").val("123"); - $("input[name='street']").val("123"); - $("input[name='city']").val("123"); - $("input[name='zip']").val("123"); - $("select[name='country_id']").val("21"); - }, - }, - { - stepId: 'acquirer-checkout-product', - element: 'input[name="acquirer"]', - trigger: 'mouseup', - }, - { - stepId: 'pay-checkout-product', - element: 'button:contains("Pay Now")', - trigger: { - url: /shop\/confirmation\//, - }, - afterTrigger: function (tour) { - console.log('{ "event": "success" }'); - }, - } - ]; - return this._super(); - }, - trigger: function () { - return (this.resume() && this.testUrl(/\/shop\//)) || this._super(); - }, - }); + // website.EditorShopTest = website.Tour.extend({ + // id: 'shop_buy_product', + // name: "Try to buy products", + // path: '/shop', + // init: function (editor) { + // var self = this; + // self.steps = [ + // { + // title: 'begin-test', + // template: self.popover({ next: "Start Test"}), + // backdrop: true, + // }, + // { + // element: '.oe_product_cart a:contains("iPod")', + // trigger: { + // url: /shop\/product\/.*/, + // }, + // }, + // { + // element: 'input[name="product_id"]:not([checked])', + // trigger: 'mouseup', + // }, + // { + // element: 'form[action="/shop/add_cart/"] button', + // trigger: { + // url: '/shop/mycart/', + // }, + // }, + // { + // element: 'form[action="/shop/add_cart/"] button:contains("Add to Cart")', + // trigger: 'reload', + // }, + // { + // element: '.oe_mycart a.js_add_cart_json:eq(1)', + // trigger: 'ajax', + // }, + // { + // element: '.oe_mycart a.js_add_cart_json:eq(2)', + // trigger: 'reload', + // }, + // { + // element: '.oe_mycart input.js_quantity', + // sampleText: '1', + // trigger: 'reload', + // }, + // { + // element: 'a[href="/shop/checkout/"]', + // trigger: { + // url: '/shop/checkout/', + // }, + // }, + // { + // element: 'form[action="/shop/confirm_order/"] button', + // trigger: { + // url: '/shop/confirm_order/', + // }, + // beforeTrigger: function (tour) { + // $("input[name='phone']").val(""); + // }, + // }, + // { + // element: 'form[action="/shop/confirm_order/"] button', + // trigger: { + // url: '/shop/payment/', + // }, + // beforeTrigger: function (tour) { + // if ($("input[name='name']").val() === "") + // $("input[name='name']").val("website_sale-test-shoptest"); + // if ($("input[name='email']").val() === "") + // $("input[name='email']").val("website_sale-test-shoptest@website_sale-test-shoptest.optenerp.com"); + // $("input[name='phone']").val("123"); + // $("input[name='street']").val("123"); + // $("input[name='city']").val("123"); + // $("input[name='zip']").val("123"); + // $("select[name='country_id']").val("21"); + // }, + // }, + // { + // element: 'input[name="acquirer"]', + // trigger: 'mouseup', + // }, + // { + // element: 'button:contains("Pay Now")', + // trigger: { + // url: /shop\/confirmation\//, + // }, + // afterTrigger: function (tour) { + // console.log('{ "event": "success" }'); + // }, + // } + // ]; + // return this._super(); + // }, + // trigger: function () { + // return (this.resume() && this.testUrl(/\/shop\//)) || this._super(); + // }, + // }); + // // for test without editor bar + // $(document).ready(function () { + // website.Tour.add(website.EditorShopTest); + // }); }()); diff --git a/addons/website_sale/tests/test_ui.py b/addons/website_sale/tests/test_ui.py index ec852bdfa3b..f3ad5aeef1e 100644 --- a/addons/website_sale/tests/test_ui.py +++ b/addons/website_sale/tests/test_ui.py @@ -3,6 +3,6 @@ import openerp.addons.website.tests.test_ui as test_ui def load_tests(loader, base, _): base.addTest(test_ui.WebsiteUiSuite(test_ui.full_path(__file__,'website_sale-sale_process-test.js'), { 'action': 'website.action_website_homepage' }, 120.0)) - base.addTest(test_ui.WebsiteUiSuite(test_ui.full_path(__file__,'website_sale-sale_process-test-2.js'), - { 'action': 'website.action_website_homepage' }, 120.0)) + # base.addTest(test_ui.WebsiteUiSuite(test_ui.full_path(__file__,'website_sale-sale_process-test-2.js'), + # { 'action': 'website.action_website_homepage' }, 120.0)) return base \ No newline at end of file diff --git a/addons/website_sale/tests/ui_suite/website_sale-sale_process-test-2.js b/addons/website_sale/tests/ui_suite/website_sale-sale_process-test-2.js index 35e1ba6edd3..b8385f74408 100644 --- a/addons/website_sale/tests/ui_suite/website_sale-sale_process-test-2.js +++ b/addons/website_sale/tests/ui_suite/website_sale-sale_process-test-2.js @@ -7,12 +7,12 @@ testRunner.run(function websiteSaleTest (page, timeout) { waitFor(function clientReady () { return page.evaluate(function () { return window.$ && window.openerp && window.openerp.website - && window.openerp.website.TestConsole - && window.openerp.website.TestConsole.test('shop'); + && window.openerp.website.Tour + && window.openerp.website.Tour.get('shop'); }); }, function executeTest () { page.evaluate(function () { - window.openerp.website.TestConsole.test('shop').run(true); + window.openerp.website.Tour.get('shop').run(true, true); }); waitFor(function testExecuted () { var after = page.evaluate(function () { diff --git a/addons/website_sale/tests/ui_suite/website_sale-sale_process-test.js b/addons/website_sale/tests/ui_suite/website_sale-sale_process-test.js index 5e6b8279306..41dc4f5ea67 100644 --- a/addons/website_sale/tests/ui_suite/website_sale-sale_process-test.js +++ b/addons/website_sale/tests/ui_suite/website_sale-sale_process-test.js @@ -7,12 +7,12 @@ testRunner.run(function websiteSaleTest (page, timeout) { waitFor(function clientReady () { return page.evaluate(function () { return window.$ && window.openerp && window.openerp.website - && window.openerp.website.TestConsole - && window.openerp.website.TestConsole.test('shop_buy_product'); + && window.openerp.website.Tour + && window.openerp.website.Tour.get('shop_buy_product'); }); }, function executeTest () { page.evaluate(function () { - window.openerp.website.TestConsole.test('shop_buy_product').run(true); + window.openerp.website.TestConsole.test('shop_buy_product').run(true, true); }); }, timeout); }); \ No newline at end of file From 895088a91a350f048349f7d340c6c62b020280c8 Mon Sep 17 00:00:00 2001 From: jke-openerp Date: Thu, 30 Jan 2014 22:16:49 +0100 Subject: [PATCH 42/55] [FIX] Remove delivery amount from get_price. Else some codes use the delivery amount in the total to compute itself. Eg: An order of 290$ wih delivery amount of 20$ --> Delivery free if getPrice>300$ -> Delivery = 0$ bzr revid: jke@openerp.com-20140130211649-0x9ryb3349vn7ubh --- addons/delivery/delivery.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/addons/delivery/delivery.py b/addons/delivery/delivery.py index 7a288ac6f70..200e18b8e42 100644 --- a/addons/delivery/delivery.py +++ b/addons/delivery/delivery.py @@ -192,7 +192,7 @@ class delivery_grid(osv.osv): weight = 0 volume = 0 for line in order.order_line: - if not line.product_id: + if not line.product_id or line.is_delivery: continue total += line.price_subtotal or 0.0 weight += (line.product_id.weight or 0.0) * line.product_uom_qty From 1931c307a27996541df4ad307c2d2d1acc558d43 Mon Sep 17 00:00:00 2001 From: Fabien Meghazi Date: Thu, 30 Jan 2014 22:20:53 +0100 Subject: [PATCH 43/55] [IMP] Improved qweb exeptions handling bzr revid: fme@openerp.com-20140130212053-fkb9ug49qun54ehi --- addons/website/models/ir_http.py | 16 ++++++---------- addons/website/views/website_templates.xml | 17 ++++++++++++----- 2 files changed, 18 insertions(+), 15 deletions(-) diff --git a/addons/website/models/ir_http.py b/addons/website/models/ir_http.py index 4838e650651..d8773e6ebfc 100644 --- a/addons/website/models/ir_http.py +++ b/addons/website/models/ir_http.py @@ -103,20 +103,16 @@ class ir_http(orm.AbstractModel): traceback=traceback.format_exc(exception), ) if exception: - current_exception = exception + code = getattr(exception, 'code', code) if isinstance(exception, ir_qweb.QWebException): values.update(qweb_exception=exception) - if exception.inner: - current_exception = exception.inner - if isinstance(current_exception, openerp.exceptions.AccessError): - code = 403 - else: - code = getattr(exception, 'code', code) + if isinstance(exception.qweb.get('inner'), openerp.exceptions.AccessError): + code = 403 if code == 500: logger.error("500 Internal Server Error:\n\n%s", values['traceback']) - if values.get('qweb_exception'): + if 'qweb_exception' in values: view = request.registry.get("ir.ui.view") - views = view._views_get(request.cr, request.uid, values['qweb_exception'].template, request.context) + views = view._views_get(request.cr, request.uid, exception.qweb['template'], request.context) to_reset = [v for v in views if v.model_data_id.noupdate is True] values['views'] = to_reset elif code == 403: @@ -132,7 +128,7 @@ class ir_http(orm.AbstractModel): try: html = request.website._render('website.%s' % code, values) - except: + except Exception: html = request.website._render('website.http_error', values) return werkzeug.wrappers.Response(html, status=code, content_type='text/html;charset=utf-8') diff --git a/addons/website/views/website_templates.xml b/addons/website/views/website_templates.xml index e34d1e5925a..993ef43f6db 100644 --- a/addons/website/views/website_templates.xml +++ b/addons/website/views/website_templates.xml @@ -451,7 +451,10 @@

      The following error was raised in the website controller

      -

      Error message: 

      
+                    
      
+                        Error message:
+                        
      +
    @@ -466,11 +469,15 @@

    - The error occured while rendering the template - and evaluating the following expression: + Error message: + 

                         
    
-                    
-                        
    +                    
    
+                        The error occured while rendering the template 
+                        and evaluating the following expression: 
+                    
    
+                    
+
    From d34abbf1ccc9f68d7539fb64e84fc8ec40cad93f Mon Sep 17 00:00:00 2001 From: openerp-sle Date: Thu, 30 Jan 2014 22:24:34 +0100 Subject: [PATCH 44/55] [FIX] harmonize website_customer, website_crm_partner_assign and website_membership views bzr revid: openerp-sle@openerp-sle.home-20140130212434-pqvwrrcd355y77id --- .../views/website_crm_partner_assign.xml | 3 ++- .../website_customer/views/website_customer.xml | 15 +++++++-------- .../views/website_membership.xml | 2 +- 3 files changed, 10 insertions(+), 10 deletions(-) diff --git a/addons/website_crm_partner_assign/views/website_crm_partner_assign.xml b/addons/website_crm_partner_assign/views/website_crm_partner_assign.xml index 9906eaf87c6..3afa77581ac 100644 --- a/addons/website_crm_partner_assign/views/website_crm_partner_assign.xml +++ b/addons/website_crm_partner_assign/views/website_crm_partner_assign.xml @@ -42,7 +42,8 @@
  • - () + +
    • diff --git a/addons/website_customer/views/website_customer.xml b/addons/website_customer/views/website_customer.xml index d58e3dfa262..00c3552c59e 100644 --- a/addons/website_customer/views/website_customer.xml +++ b/addons/website_customer/views/website_customer.xml @@ -43,15 +43,14 @@

    No result found.

     -
    - - +
    + + -
    -

    +
    -

    -
    +
    +
    @@ -76,7 +75,7 @@ - - -