summaryrefslogtreecommitdiff
path: root/addons/google_account/controllers/main.py
diff options
context:
space:
mode:
authorRaphael Collet <rco@openerp.com>2014-07-06 16:44:26 +0200
committerAntony Lesuisse <al@openerp.com>2014-07-06 17:05:41 +0200
commitcbe2dbb672a6c55d86f2e515f9d1cdfee426ef80 (patch)
treed6ff62b719fce32392397783c961b734b1e4c50e /addons/google_account/controllers/main.py
parentd78192c489d3be66cd6487b39f5ce7ba4733a187 (diff)
[MERGE] new v8 api by rco
A squashed merge is required as the conversion of the apiculture branch from bzr to git was not correctly done. The git history contains irrelevant blobs and commits. This branch brings a lot of changes and fixes, too many to list exhaustively. - New orm api, objects are now used instead of ids - Environements to encapsulates cr uid context while maintaining backward compatibility - Field compute attribute is a new object oriented way to define function fields - Shared browse record cache - New onchange protocol - Optional copy flag on fields - Documentation update - Dead code cleanup - Lots of fixes
Diffstat (limited to 'addons/google_account/controllers/main.py')
-rw-r--r--addons/google_account/controllers/main.py6
1 files changed, 3 insertions, 3 deletions
diff --git a/addons/google_account/controllers/main.py b/addons/google_account/controllers/main.py
index 40843b6f4ba..2a3a4ae586f 100644
--- a/addons/google_account/controllers/main.py
+++ b/addons/google_account/controllers/main.py
@@ -1,8 +1,8 @@
import simplejson
import urllib
import openerp
-import openerp.addons.web.http as http
-from openerp.addons.web.http import request
+from openerp import http
+from openerp.http import request
import openerp.addons.web.controllers.main as webmain
from openerp.addons.web.http import SessionExpiredException
from werkzeug.exceptions import BadRequest
@@ -27,6 +27,6 @@ class google_auth(http.Controller):
elif kw.get('error'):
return werkzeug.utils.redirect("%s%s%s" % (url_return ,"?error=" , kw.get('error')))
else:
- return werkzeug.utils.redirect("%s%s%s" % (url_return ,"?error=Unknown_error"))
+ return werkzeug.utils.redirect("%s%s" % (url_return ,"?error=Unknown_error"))