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

[IMP] remove standalone web client, fix imports 

bzr revid: al@openerp.com-20121010204617-ah29rz616xo7i2dr
This commit is contained in:
Antony Lesuisse 2012-10-10 22:46:17 +02:00
parent 07e1fba67d
commit 84a7523a63
9 changed files with 70 additions and 101 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
addons/auth_oauth/controllers/main.py
View File

@ -4,28 +4,25 @@ import simplejson
import werkzeug.urls import werkzeug.urls
import werkzeug.utils import werkzeug.utils
import openerp.modules.registry import openerp
import openerp.addons.web.controllers.main
import openerp.addons.web.common.http as openerpweb
from openerp import SUPERUSER_ID
_logger = logging.getLogger(__name__) _logger = logging.getLogger(__name__)
class OAuthController(openerpweb.Controller): class OAuthController(openerp.addons.web.http.Controller):
_cp_path = '/auth_oauth' _cp_path = '/auth_oauth'
@openerpweb.jsonrequest @openerp.addons.web.http.jsonrequest
def list_providers(self, req, dbname): def list_providers(self, req, dbname):
try: try:
registry = openerp.modules.registry.RegistryManager.get(dbname) registry = openerp.modules.registry.RegistryManager.get(dbname)
with registry.cursor() as cr: with registry.cursor() as cr:
providers = registry.get('auth.oauth.provider') providers = registry.get('auth.oauth.provider')
l = providers.read(cr, SUPERUSER_ID, providers.search(cr, SUPERUSER_ID, [('enabled','=',True)])) l = providers.read(cr, openerp.SUPERUSER_ID, providers.search(cr, openerp.SUPERUSER_ID, [('enabled','=',True)]))
except Exception: except Exception:
l = [] l = []
return l return l
@openerpweb.httprequest @openerp.addons.web.http.httprequest
def signin(self, req, **kw): def signin(self, req, **kw):
state = simplejson.loads(kw['state']) state = simplejson.loads(kw['state'])
dbname = state['d'] dbname = state['d']
@ -34,7 +31,7 @@ class OAuthController(openerpweb.Controller):
with registry.cursor() as cr: with registry.cursor() as cr:
try: try:
u = registry.get('res.users') u = registry.get('res.users')
credentials = u.auth_oauth(cr, SUPERUSER_ID, provider, kw) credentials = u.auth_oauth(cr, openerp.SUPERUSER_ID, provider, kw)
cr.commit() cr.commit()
return openerp.addons.web.controllers.main.login_and_redirect(req, *credentials) return openerp.addons.web.controllers.main.login_and_redirect(req, *credentials)
except AttributeError: except AttributeError:

23
addons/auth_openid/controllers/main.py
View File

@ -23,24 +23,21 @@ import logging
import os import os
import tempfile import tempfile
import urllib import urllib
from openerp import SUPERUSER_ID
import werkzeug.urls import werkzeug.urls
import werkzeug.exceptions import werkzeug.exceptions
from openerp.modules.registry import RegistryManager
from openerp.addons.web.controllers.main import login_and_redirect, set_cookie_and_redirect
try:
import openerp.addons.web.common.http as openerpweb
except ImportError:
import web.common.http as openerpweb # noqa
from openid import oidutil from openid import oidutil
from openid.store import filestore from openid.store import filestore
from openid.consumer import consumer from openid.consumer import consumer
from openid.cryptutil import randomString from openid.cryptutil import randomString
from openid.extensions import ax, sreg from openid.extensions import ax, sreg
import openerp
from openerp import SUPERUSER_ID
from openerp.modules.registry import RegistryManager
from openerp.addons.web.controllers.main import login_and_redirect, set_cookie_and_redirect
from .. import utils from .. import utils
_logger = logging.getLogger(__name__) _logger = logging.getLogger(__name__)
@ -70,7 +67,7 @@ class GoogleAppsAwareConsumer(consumer.GenericConsumer):
return super(GoogleAppsAwareConsumer, self).complete(message, endpoint, return_to) return super(GoogleAppsAwareConsumer, self).complete(message, endpoint, return_to)
class OpenIDController(openerpweb.Controller): class OpenIDController(openerp.addons.web.http.Controller):
_cp_path = '/auth_openid/login' _cp_path = '/auth_openid/login'
_store = filestore.FileOpenIDStore(_storedir) _store = filestore.FileOpenIDStore(_storedir)
@ -118,7 +115,7 @@ class OpenIDController(openerpweb.Controller):
def _get_realm(self, req): def _get_realm(self, req):
return req.httprequest.host_url return req.httprequest.host_url
@openerpweb.httprequest @openerp.addons.web.http.httprequest
def verify_direct(self, req, db, url): def verify_direct(self, req, db, url):
result = self._verify(req, db, url) result = self._verify(req, db, url)
if 'error' in result: if 'error' in result:
@ -127,7 +124,7 @@ class OpenIDController(openerpweb.Controller):
return werkzeug.utils.redirect(result['value']) return werkzeug.utils.redirect(result['value'])
return result['value'] return result['value']
@openerpweb.jsonrequest @openerp.addons.web.http.jsonrequest
def verify(self, req, db, url): def verify(self, req, db, url):
return self._verify(req, db, url) return self._verify(req, db, url)
@ -157,7 +154,7 @@ class OpenIDController(openerpweb.Controller):
form_html = request.htmlMarkup(realm, redirect_to) form_html = request.htmlMarkup(realm, redirect_to)
return {'action': 'post', 'value': form_html, 'session_id': req.session_id} return {'action': 'post', 'value': form_html, 'session_id': req.session_id}
@openerpweb.httprequest @openerp.addons.web.http.httprequest
def process(self, req, **kw): def process(self, req, **kw):
session = getattr(req.session, 'openid_session', None) session = getattr(req.session, 'openid_session', None)
if not session: if not session:
@ -225,7 +222,7 @@ class OpenIDController(openerpweb.Controller):
return set_cookie_and_redirect(req, '/#action=login&loginerror=1') return set_cookie_and_redirect(req, '/#action=login&loginerror=1')
@openerpweb.jsonrequest @openerp.addons.web.http.jsonrequest
def status(self, req): def status(self, req):
session = getattr(req.session, 'openid_session', {}) session = getattr(req.session, 'openid_session', {})
return {'status': session.get('status'), 'message': session.get('message')} return {'status': session.get('status'), 'message': session.get('message')}

14
addons/auth_reset_password/controllers/main.py
View File

@ -18,20 +18,20 @@
# along with this program. If not, see <http://www.gnu.org/licenses/> # along with this program. If not, see <http://www.gnu.org/licenses/>
# #
############################################################################## ##############################################################################
import logging
from openerp import SUPERUSER_ID
from openerp.modules.registry import RegistryManager
import openerp.addons.web.common.http as openerpweb
import werkzeug import werkzeug
import logging import openerp
from openerp import SUPERUSER_ID
from openerp.modules.registry import RegistryManager
_logger = logging.getLogger(__name__) _logger = logging.getLogger(__name__)
class Controller(openerpweb.Controller): class Controller(openerp.addons.web.http.Controller):
_cp_path = '/auth_reset_password' _cp_path = '/auth_reset_password'
@openerpweb.httprequest @openerp.addons.web.http.httprequest
def reset_password(self, req, dbname, login): def reset_password(self, req, dbname, login):
""" retrieve user, and perform reset password """ """ retrieve user, and perform reset password """
url = '/' url = '/'

21
addons/auth_signup/controllers/main.py
View File

@ -18,31 +18,30 @@
# along with this program. If not, see <http://www.gnu.org/licenses/> # along with this program. If not, see <http://www.gnu.org/licenses/>
# #
############################################################################## ##############################################################################
import logging
from openerp import SUPERUSER_ID
from openerp.modules.registry import RegistryManager
from openerp.addons.web.controllers.main import login_and_redirect
import openerp.addons.web.common.http as openerpweb
import werkzeug import werkzeug
import logging import openerp
from openerp.modules.registry import RegistryManager
from openerp.addons.web.controllers.main import login_and_redirect
_logger = logging.getLogger(__name__) _logger = logging.getLogger(__name__)
class Controller(openerpweb.Controller): class Controller(openerp.addons.web.http.Controller):
_cp_path = '/auth_signup' _cp_path = '/auth_signup'
@openerpweb.jsonrequest @openerp.addons.web.http.jsonrequest
def retrieve(self, req, dbname, token): def retrieve(self, req, dbname, token):
""" retrieve the user info (name, login or email) corresponding to a signup token """ """ retrieve the user info (name, login or email) corresponding to a signup token """
registry = RegistryManager.get(dbname) registry = RegistryManager.get(dbname)
user_info = None user_info = None
with registry.cursor() as cr: with registry.cursor() as cr:
res_partner = registry.get('res.partner') res_partner = registry.get('res.partner')
user_info = res_partner.signup_retrieve_info(cr, SUPERUSER_ID, token) user_info = res_partner.signup_retrieve_info(cr, openerp.SUPERUSER_ID, token)
return user_info return user_info
@openerpweb.httprequest @openerp.addons.web.http.httprequest
def signup(self, req, dbname, token, name, login, password): def signup(self, req, dbname, token, name, login, password):
""" sign up a user (new or existing), and log it in """ """ sign up a user (new or existing), and log it in """
url = '/' url = '/'
@ -51,7 +50,7 @@ class Controller(openerpweb.Controller):
try: try:
res_users = registry.get('res.users') res_users = registry.get('res.users')
values = {'name': name, 'login': login, 'password': password} values = {'name': name, 'login': login, 'password': password}
credentials = res_users.signup(cr, SUPERUSER_ID, values, token) credentials = res_users.signup(cr, openerp.SUPERUSER_ID, values, token)
cr.commit() cr.commit()
return login_and_redirect(req, *credentials) return login_and_redirect(req, *credentials)
except Exception as e: except Exception as e:

9
addons/base_import/controllers.py
View File

@ -1,15 +1,12 @@
# -*- coding: utf-8 -*- # -*- coding: utf-8 -*-
import simplejson import simplejson
try: import openerp
import openerp.addons.web.common.http as openerpweb
except ImportError:
import web.common.http as openerpweb
class ImportController(openerpweb.Controller): class ImportController(openerp.addons.web.http.Controller):
_cp_path = '/base_import' _cp_path = '/base_import'
@openerpweb.httprequest @openerp.addons.web.http.httprequest
def set_file(self, req, file, import_id, jsonp='callback'): def set_file(self, req, file, import_id, jsonp='callback'):
import_id = int(import_id) import_id = int(import_id)

15
addons/board/controllers.py
View File

@ -1,19 +1,14 @@
# -*- coding: utf-8 -*- # -*- coding: utf-8 -*-
from xml.etree import ElementTree from xml.etree import ElementTree
try: import openerp
import openerp.addons.web.common.http as openerpweb from openerp.addons.web import nonliterals
from openerp.addons.web.common import nonliterals from openerp.addons.web.controllers.main import load_actions_from_ir_values
from openerp.addons.web.controllers.main import load_actions_from_ir_values
except ImportError:
import web.common.http as openerpweb # noqa
from web.common import nonliterals # noqa
from web.controllers.main import load_actions_from_ir_values # noqa
class Board(openerpweb.Controller): class Board(openerp.addons.web.http.Controller):
_cp_path = '/board' _cp_path = '/board'
@openerpweb.jsonrequest @openerp.addons.web.http.jsonrequest
def add_to_dashboard(self, req, menu_id, action_id, context_to_save, domain, view_mode, name=''): def add_to_dashboard(self, req, menu_id, action_id, context_to_save, domain, view_mode, name=''):
# FIXME move this method to board.board model # FIXME move this method to board.board model
to_eval = nonliterals.CompoundContext(context_to_save) to_eval = nonliterals.CompoundContext(context_to_save)

48
addons/point_of_sale/controllers/main.py
View File

@ -4,16 +4,12 @@ import simplejson
import os import os
import openerp import openerp
try: from openerp.addons.web.controllers.main import manifest_list, module_boot, html_template
import openerp.addons.web.common.http as openerpweb
from openerp.addons.web.controllers.main import manifest_list, module_boot, html_template
except ImportError:
import web.common.http as openerpweb
class PointOfSaleController(openerpweb.Controller): class PointOfSaleController(openerp.addons.web.http.Controller):
_cp_path = '/pos' _cp_path = '/pos'
@openerpweb.httprequest @openerp.addons.web.http.httprequest
def app(self, req, s_action=None, **kw): def app(self, req, s_action=None, **kw):
js = "\n ".join('<script type="text/javascript" src="%s"></script>' % i for i in manifest_list(req, None, 'js')) js = "\n ".join('<script type="text/javascript" src="%s"></script>' % i for i in manifest_list(req, None, 'js'))
css = "\n ".join('<link rel="stylesheet" href="%s">' % i for i in manifest_list(req, None, 'css')) css = "\n ".join('<link rel="stylesheet" href="%s">' % i for i in manifest_list(req, None, 'css'))
@ -29,7 +25,7 @@ class PointOfSaleController(openerpweb.Controller):
} }
return r return r
@openerpweb.httprequest @openerp.addons.web.http.httprequest
def manifest(self, req, **kwargs): def manifest(self, req, **kwargs):
""" This generates a HTML5 cache manifest files that preloads the categories and products thumbnails """ This generates a HTML5 cache manifest files that preloads the categories and products thumbnails
and other ressources necessary for the point of sale to work offline """ and other ressources necessary for the point of sale to work offline """
@ -66,12 +62,12 @@ class PointOfSaleController(openerpweb.Controller):
return m return m
@openerpweb.jsonrequest @openerp.addons.web.http.jsonrequest
def dispatch(self, request, iface, **kwargs): def dispatch(self, request, iface, **kwargs):
method = 'iface_%s' % iface method = 'iface_%s' % iface
return getattr(self, method)(request, **kwargs) return getattr(self, method)(request, **kwargs)
@openerpweb.jsonrequest @openerp.addons.web.http.jsonrequest
def scan_item_success(self, request, ean): def scan_item_success(self, request, ean):
""" """
A product has been scanned with success A product has been scanned with success
@ -79,7 +75,7 @@ class PointOfSaleController(openerpweb.Controller):
print 'scan_item_success: ' + str(ean) print 'scan_item_success: ' + str(ean)
return return
@openerpweb.jsonrequest @openerp.addons.web.http.jsonrequest
def scan_item_error_unrecognized(self, request, ean): def scan_item_error_unrecognized(self, request, ean):
""" """
A product has been scanned without success A product has been scanned without success
@ -87,7 +83,7 @@ class PointOfSaleController(openerpweb.Controller):
print 'scan_item_error_unrecognized: ' + str(ean) print 'scan_item_error_unrecognized: ' + str(ean)
return return
@openerpweb.jsonrequest @openerp.addons.web.http.jsonrequest
def help_needed(self, request): def help_needed(self, request):
""" """
The user wants an help (ex: light is on) The user wants an help (ex: light is on)
@ -95,7 +91,7 @@ class PointOfSaleController(openerpweb.Controller):
print "help_needed" print "help_needed"
return return
@openerpweb.jsonrequest @openerp.addons.web.http.jsonrequest
def help_canceled(self, request): def help_canceled(self, request):
""" """
The user stops the help request The user stops the help request
@ -103,22 +99,22 @@ class PointOfSaleController(openerpweb.Controller):
print "help_canceled" print "help_canceled"
return return
@openerpweb.jsonrequest @openerp.addons.web.http.jsonrequest
def weighting_start(self, request): def weighting_start(self, request):
print "weighting_start" print "weighting_start"
return return
@openerpweb.jsonrequest @openerp.addons.web.http.jsonrequest
def weighting_read_kg(self, request): def weighting_read_kg(self, request):
print "weighting_read_kg" print "weighting_read_kg"
return 0.0 return 0.0
@openerpweb.jsonrequest @openerp.addons.web.http.jsonrequest
def weighting_end(self, request): def weighting_end(self, request):
print "weighting_end" print "weighting_end"
return return
@openerpweb.jsonrequest @openerp.addons.web.http.jsonrequest
def payment_request(self, request, price): def payment_request(self, request, price):
""" """
The PoS will activate the method payment The PoS will activate the method payment
@ -126,47 +122,47 @@ class PointOfSaleController(openerpweb.Controller):
print "payment_request: price:"+str(price) print "payment_request: price:"+str(price)
return 'ok' return 'ok'
@openerpweb.jsonrequest @openerp.addons.web.http.jsonrequest
def payment_status(self, request): def payment_status(self, request):
print "payment_status" print "payment_status"
return { 'status':'waiting' } return { 'status':'waiting' }
@openerpweb.jsonrequest @openerp.addons.web.http.jsonrequest
def payment_cancel(self, request): def payment_cancel(self, request):
print "payment_cancel" print "payment_cancel"
return return
@openerpweb.jsonrequest @openerp.addons.web.http.jsonrequest
def transaction_start(self, request): def transaction_start(self, request):
print 'transaction_start' print 'transaction_start'
return return
@openerpweb.jsonrequest @openerp.addons.web.http.jsonrequest
def transaction_end(self, request): def transaction_end(self, request):
print 'transaction_end' print 'transaction_end'
return return
@openerpweb.jsonrequest @openerp.addons.web.http.jsonrequest
def cashier_mode_activated(self, request): def cashier_mode_activated(self, request):
print 'cashier_mode_activated' print 'cashier_mode_activated'
return return
@openerpweb.jsonrequest @openerp.addons.web.http.jsonrequest
def cashier_mode_deactivated(self, request): def cashier_mode_deactivated(self, request):
print 'cashier_mode_deactivated' print 'cashier_mode_deactivated'
return return
@openerpweb.jsonrequest @openerp.addons.web.http.jsonrequest
def open_cashbox(self, request): def open_cashbox(self, request):
print 'open_cashbox' print 'open_cashbox'
return return
@openerpweb.jsonrequest @openerp.addons.web.http.jsonrequest
def print_receipt(self, request, receipt): def print_receipt(self, request, receipt):
print 'print_receipt' + str(receipt) print 'print_receipt' + str(receipt)
return return
@openerpweb.jsonrequest @openerp.addons.web.http.jsonrequest
def print_pdf_invoice(self, request, pdfinvoice): def print_pdf_invoice(self, request, pdfinvoice):
print 'print_pdf_invoice' + str(pdfinvoice) print 'print_pdf_invoice' + str(pdfinvoice)
return return

13
addons/web_linkedin/web_linkedin.py
View File

@ -19,21 +19,16 @@
# #
############################################################################## ##############################################################################
try:
# embedded
import openerp.addons.web.common.http as openerpweb
except ImportError:
# standalone
import web.common.http as openerpweb
import base64 import base64
import urllib2 import urllib2
import openerp
from osv import osv, fields from osv import osv, fields
class Binary(openerpweb.Controller): class Binary(openerp.addons.web.http.Controller):
_cp_path = "/web_linkedin/binary" _cp_path = "/web_linkedin/binary"
@openerpweb.jsonrequest @openerp.addons.web.http.jsonrequest
def url2binary(self, req,url): def url2binary(self, req,url):
bfile = urllib2.urlopen(url) bfile = urllib2.urlopen(url)
return base64.b64encode(bfile.read()) return base64.b64encode(bfile.read())

13
addons/web_shortcuts/controllers/main.py
View File

@ -1,16 +1,9 @@
try: import openerp
# embedded
import openerp.addons.web.common.http as openerpweb
import openerp.addons.web.controllers.main as webmain
except ImportError:
# standalone
import web.common.http as openerpweb
import web.controllers.main as webmain
class Shortcuts(openerpweb.Controller): class Shortcuts(openerp.addons.web.http.Controller):
_cp_path = "/web/shortcuts" _cp_path = "/web/shortcuts"
@openerpweb.jsonrequest @openerp.addons.web.http.jsonrequest
def list(self, req): def list(self, req):
return req.session.model('ir.ui.view_sc').get_sc( return req.session.model('ir.ui.view_sc').get_sc(
req.session._uid, "ir.ui.menu", req.session.eval_context(req.context)) req.session._uid, "ir.ui.menu", req.session.eval_context(req.context))