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

[IMP] production mode by default, developers should use ?debug

Browse Source 
bzr revid: al@openerp.com-20110818192150-qtwh8u3eigmkz0k9
This commit is contained in:
Antony Lesuisse
2011-08-18 21:21:50 +02:00
parent ed11f76ec5
commit 8a13e8c3a9
3 changed files with 19 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
addons/base/controllers/main.py
+9 -10
View File
@@ -67,7 +67,6 @@ def manifest_glob(addons, key):
files = []
for addon in addons:
globlist = openerpweb.addons_manifest.get(addon, {}).get(key, [])
print globlist
for pattern in globlist:
for path in glob.glob(os.path.join(openerpweb.path_addons, addon, pattern)):
files.append(path[len(openerpweb.path_addons):])
@@ -79,11 +78,11 @@ def concat_files(file_list):
concat: concatenation of file content
timestamp: max(os.path.getmtime of file_list)
"""
root = openerpweb.path_root
files_content = []
files_timestamp = 0
for i in file_list:
fname = os.path.join(root, i)
fname = os.path.join(openerpweb.path_addons, i[1:])
print fname
ftime = os.path.getmtime(fname)
if ftime > files_timestamp:
files_timestamp = ftime
@@ -96,6 +95,11 @@ home_template = textwrap.dedent("""<!DOCTYPE html>
<head>
<meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>OpenERP</title>
<link rel="shortcut icon" href="/base/static/src/img/favicon.ico" type="image/x-icon"/>
%(css)s
<!--[if lte IE 7]>
<link rel="stylesheet" href="/base/static/src/css/base-ie7.css" type="text/css"/>
<![endif]-->
%(javascript)s
<script type="text/javascript">
$(function() {
@@ -103,11 +107,6 @@ home_template = textwrap.dedent("""<!DOCTYPE html>
openerp.init().base.webclient("oe");
});
</script>
<link rel="shortcut icon" href="/base/static/src/img/favicon.ico" type="image/x-icon"/>
%(css)s
<!--[if lte IE 7]>
<link rel="stylesheet" href="/base/static/src/css/base-ie7.css" type="text/css"/>
<![endif]-->
</head>
<body id="oe" class="openerp"></body>
</html>
@@ -143,13 +142,13 @@ class WebClient(openerpweb.Controller):
def home(self, req, s_action=None):
# script tags
jslist = ['/base/webclient/js']
if 1: # debug == 1
if req.debug:
jslist = manifest_glob(['base'], 'js')
js = "\n ".join(['<script type="text/javascript" src="%s"></script>'%i for i in jslist])
# css tags
csslist = ['/base/webclient/css']
if 1: # debug == 1
if req.debug:
csslist = manifest_glob(['base'], 'css')
css = "\n ".join(['<link rel="stylesheet" href="%s">'%i for i in csslist])
r = home_template % {
addons/base/static/src/css/base.css
+1 -1
View File
@@ -381,7 +381,7 @@ label.error {
/* Header */
.openerp .header {
height: 65px;
background: url("../img/header-background.png") repeat-x scroll left top transparent;
background: url("/base/static/src/img/header-background.png") repeat-x scroll left top transparent;
color: #FFFFFF;
letter-spacing: 0.5px;
text-shadow: 0 1px 0 #333333;
openerpweb/openerpweb.py
+9 -1
View File
@@ -249,7 +249,9 @@ class CherryPyRequest(object):
host = cherrypy.config['openerp.server.host']
port = cherrypy.config['openerp.server.port']
self.session = self.httpsession.setdefault(self.session_id, OpenERPSession(host, port))
# Request attributes
self.context = self.params.pop('context', None)
self.debug = self.params.pop('debug',False) != False
class JsonRequest(CherryPyRequest):
""" JSON-RPC2 over HTTP.
@@ -361,7 +363,13 @@ class HttpRequest(CherryPyRequest):
"""
def dispatch(self, controller, method, **kw):
self.init(kw)
print "%s --> %s %s.%s %r" % (self.httprequest.method, controller.__class__.__name__, method.__name__, self.httprequest, kw)
akw = {}
for key in kw.keys():
if isinstance(kw[key], basestring) and len(kw[key]) < 1024:
akw[key] = kw[key]
else:
akw[key] = str(type(kw[key]))
print "%s --> %s.%s %r" % (self.httprequest.method, controller.__class__.__name__, method.__name__, akw)
r = method(controller, self, **kw)
print "<--", 'size:', len(r)
print