pengyuthon/odoo_source
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[FORWARD] Forward port of saas-2 branch until revision 3845 revision tde@openerp.com-20131003090049-88q0o69970eahb2h

Browse Source 
bzr revid: tde@openerp.com-20131004084618-pjv4ya68mvzfqreb
This commit is contained in:
Thibault Delavallée
2013-10-04 10:46:18 +02:00
parent 9e85aa3e72 6e6977e0f2
commit 6ea427eb9f
6 changed files with 27 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files
addons/web/http.py
+24 -30
View File
@@ -177,6 +177,11 @@ class WebRequest(object):
self.disable_db = True
self.uid = None
@property
def debug(self):
return 'debug' in self.httprequest.args
def auth_method_user():
request.uid = request.session.uid
@@ -382,10 +387,10 @@ def jsonrequest(f):
Use the ``route()`` decorator instead.
"""
f.combine = True
base = f.__name__
base = f.__name__.lstrip('/')
if f.__name__ == "index":
base = ""
return route([base, os.path.join(base, "<path:_ignored_path>")], type="json", auth="user")(f)
return route([base, base + "/<path:_ignored_path>"], type="json", auth="none")(f)
class HttpRequest(WebRequest):
""" Regular GET/POST request
@@ -460,10 +465,10 @@ def httprequest(f):
Use the ``route()`` decorator instead.
"""
f.combine = True
base = f.__name__
base = f.__name__.lstrip('/')
if f.__name__ == "index":
base = ""
return route([base, os.path.join(base, "<path:_ignored_path>")], type="http", auth="user")(f)
return route([base, base + "/<path:_ignored_path>"], type="http", auth="none")(f)
#----------------------------------------------------------
# Local storage of requests
@@ -496,16 +501,13 @@ class ControllerType(type):
def __init__(cls, name, bases, attrs):
super(ControllerType, cls).__init__(name, bases, attrs)
# create wrappers for old-style methods with req as first argument
cls._methods_wrapper = {}
# flag old-style methods with req as first argument
for k, v in attrs.items():
if inspect.isfunction(v):
spec = inspect.getargspec(v)
first_arg = spec.args[1] if len(spec.args) >= 2 else None
if first_arg in ["req", "request"]:
def build_new(nv):
return lambda self, *args, **kwargs: nv(self, request, *args, **kwargs)
cls._methods_wrapper[k] = build_new(v)
v._first_arg_is_req = True
# store the controller in the controllers list
name_class = ("%s.%s" % (cls.__module__, cls.__name__), cls)
@@ -514,7 +516,6 @@ class ControllerType(type):
return
# we want to know all modules that have controllers
module = class_path[2]
controllers_per_module.setdefault(module, [])
# but we only store controllers directly inheriting from Controller
if not "Controller" in globals() or not Controller in bases:
return
@@ -523,12 +524,6 @@ class ControllerType(type):
class Controller(object):
__metaclass__ = ControllerType
def get_wrapped_method(self, name):
if name in self.__class__._methods_wrapper:
return functools.partial(self.__class__._methods_wrapper[name], self)
else:
return getattr(self, name)
#############################
# OpenERP Sessions #
#############################
@@ -987,8 +982,8 @@ class Root(object):
cls = v[1]
subclasses = cls.__subclasses__()
subclasses = [c for c in subclasses if c.__module__.split(".")[:2] == ["openerp", "addons"] and \
cls.__module__.split(".")[2] in modules]
subclasses = [c for c in subclasses if c.__module__.startswith('openerp.addons.') and
c.__module__.split(".")[2] in modules]
if subclasses:
name = "%s (extended by %s)" % (cls.__name__, ', '.join(sub.__name__ for sub in subclasses))
cls = type(name, tuple(reversed(subclasses)), {})
@@ -997,17 +992,15 @@ class Root(object):
members = inspect.getmembers(o)
for mk, mv in members:
if inspect.ismethod(mv) and getattr(mv, 'exposed', False) and \
nodb_only == (getattr(mv, "auth", None) == "none"):
function = (o.get_wrapped_method(mk), mv)
nodb_only == (getattr(mv, "auth", "none") == "none"):
for url in mv.routes:
if getattr(mv, "combine", False):
url = os.path.join(o._cp_path, url)
url = o._cp_path.rstrip('/') + '/' + url.lstrip('/')
if url.endswith("/") and len(url) > 1:
url = url[: -1]
routing_map.add(routing.Rule(url, endpoint=function))
routing_map.add(routing.Rule(url, endpoint=mv))
modules_set = set(controllers_per_module.keys())
modules_set -= set("web")
modules_set = set(controllers_per_module.keys()) - set(['web'])
# building all none methods
gen(["web"] + sorted(modules_set), True)
if not db:
@@ -1016,12 +1009,12 @@ class Root(object):
registry = openerp.modules.registry.RegistryManager.get(db)
with registry.cursor() as cr:
m = registry.get('ir.module.module')
ids = m.search(cr, openerp.SUPERUSER_ID, [('state','=','installed')])
ids = m.search(cr, openerp.SUPERUSER_ID, [('state', '=', 'installed'), ('name', '!=', 'web')])
installed = set([x['name'] for x in m.read(cr, 1, ids, ['name'])])
modules_set = modules_set.intersection(set(installed))
modules = ["web"] + sorted(modules_set)
# building all other methods
gen(["web"] + sorted(modules_set), False)
gen(modules, False)
return routing_map
@@ -1044,17 +1037,18 @@ class Root(object):
"""
path = request.httprequest.path
urls = self.get_db_router(request.db).bind("")
matched, arguments = urls.match(path)
func, arguments = urls.match(path)
arguments = dict([(k, v) for k, v in arguments.items() if not k.startswith("_ignored_")])
func, original = matched
def nfunc(*args, **kwargs):
kwargs.update(arguments)
if getattr(func, '_first_arg_is_req', False):
args = (request,) + args
return func(*args, **kwargs)
request.func = nfunc
request.auth_method = getattr(original, "auth", "user")
request.func_request_type = original.exposed
request.auth_method = getattr(func, "auth", "user")
request.func_request_type = func.exposed
root = None
addons/web/static/src/css/base.css
+1 -3
View File
@@ -2741,6 +2741,7 @@
}
.openerp ul.oe_form_status .oe_folded ul, .openerp ul.oe_form_status_clickable .oe_folded ul {
position: absolute;
z-index: 1000;
border-top: 1px solid #cacaca;
float: none;
top: 30px;
@@ -3211,9 +3212,6 @@
}
@-moz-document url-prefix() {
.openerp .oe_view_manager .oe_view_manager_switch li {
line-height: 21px;
}
.openerp .oe_searchview .oe_searchview_search {
top: -1px;
}
addons/web/static/src/css/base.sass
+1 -2
View File
@@ -2179,6 +2179,7 @@ $sheet-padding: 16px
padding-bottom: 8px
ul
position: absolute
z-index: 1000
border-top: 1px solid #cacaca
float: none
top: 30px
@@ -2532,8 +2533,6 @@ $sheet-padding: 16px
// }}}
@-moz-document url-prefix()
.openerp
.oe_view_manager .oe_view_manager_switch li
line-height: 21px
.oe_searchview .oe_searchview_search
top: -1px
.oe_form_field_many2one .oe_m2o_cm_button
addons/web_kanban/static/src/css/kanban.css
-4
View File
@@ -5,7 +5,6 @@
}
.openerp .oe_kanban_view .oe_view_nocontent {
position: relative;
z-index: 1;
max-width: none;
height: 100%;
}
@@ -91,9 +90,6 @@
.openerp .oe_kanban_view .oe_kanban_groups {
height: inherit;
}
.openerp .oe_kanban_view.oe_kanban_ungrouped .oe_kanban_groups {
width: 100%;
}
.openerp .oe_kanban_view.oe_kanban_grouped_by_m2o .oe_kanban_group_title {
cursor: move;
}
addons/web_kanban/static/src/css/kanban.sass
-3
View File
@@ -53,7 +53,6 @@
height: inherit
.oe_view_nocontent
position: relative
z-index: 1
max-width: none
height: 100%
.oe_view_nocontent_content
@@ -118,8 +117,6 @@
// KanbanGroups {{{
.oe_kanban_groups
height: inherit
&.oe_kanban_ungrouped .oe_kanban_groups
width: 100%
&.oe_kanban_grouped_by_m2o .oe_kanban_group_title
cursor: move
.oe_kanban_header
addons/web_kanban_sparkline/static/src/js/kanban_sparkline.js
+1
View File
@@ -20,6 +20,7 @@ instance.web_kanban.SparklineBarWidget = instance.web_kanban.AbstractField.exten
barWidth: 4,
barSpacing: 1,
barColor: '#96d854',
chartRangeMin: 0,
tooltipFormat: '{{offset:offset}} {{value}}',
tooltipValueLookups: {
'offset': tooltips