[IMP] Improve stock's barcode start page
remove module_boot() usage
This commit is contained in:
Fabien Meghazi
parent
22b1f5ce0c
commit
c6c7fab217
|
|
@ -1,57 +1,11 @@
|
|||
# -*- coding: utf-8 -*-
|
||||
import logging
|
||||
import simplejson
|
||||
|
||||
from openerp import http
|
||||
from openerp.http import request
|
||||
from openerp.addons.web.controllers.main import module_boot
|
||||
|
||||
_logger = logging.getLogger(__name__)
|
||||
|
||||
html_template = """<!DOCTYPE html>
|
||||
<html>
|
||||
<head>
|
||||
<title>Barcode Scanner</title>
|
||||
|
||||
<meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1"/>
|
||||
<meta http-equiv="content-type" content="text/html, charset=utf-8" />
|
||||
|
||||
<meta name="viewport" content=" width=1024, user-scalable=no">
|
||||
<meta name="apple-mobile-web-app-capable" content="yes">
|
||||
<meta name="mobile-web-app-capable" content="yes">
|
||||
|
||||
<link rel="shortcut icon" sizes="80x51" href="/stock/static/src/img/scan.png">
|
||||
<link rel="shortcut icon" href="/web/static/src/img/favicon.ico" type="image/x-icon"/>
|
||||
<link rel="stylesheet" href="/stock/static/src/css/barcode.css" />
|
||||
<link rel="stylesheet" href="/web/static/lib/bootstrap/css/bootstrap.css" />
|
||||
<link rel="stylesheet" href="/web/static/lib/jquery.ui/css/smoothness/jquery-ui-1.9.1.custom.css" />
|
||||
<link rel="stylesheet" href="/web/static/lib/fontawesome/css/font-awesome.css" />
|
||||
<script type="text/javascript" src="/web/js/web.assets_common"></script>
|
||||
<script type="text/javascript" src="/web/js/web.assets_backend"></script>
|
||||
<script type="text/javascript">
|
||||
$(function() {
|
||||
var s = new openerp.init(%(modules)s);
|
||||
%(init)s
|
||||
});
|
||||
</script>
|
||||
</head>
|
||||
<body>
|
||||
<div class="openerp openerp_webclient_container">
|
||||
<table class="oe_webclient">
|
||||
<tr>
|
||||
<td class="oe_application"/>
|
||||
</tr>
|
||||
</table>
|
||||
</div>
|
||||
|
||||
<!--[if lte IE 8]>
|
||||
<script src="//ajax.googleapis.com/ajax/libs/chrome-frame/1/CFInstall.min.js"></script>
|
||||
<script>CFInstall.check({mode: "overlay"});</script>
|
||||
<![endif]-->
|
||||
</body>
|
||||
</html>
|
||||
"""
|
||||
|
||||
class BarcodeController(http.Controller):
|
||||
|
||||
@http.route(['/barcode/web/'], type='http', auth='user')
|
||||
|
|
@ -59,16 +13,4 @@ class BarcodeController(http.Controller):
|
|||
if not request.session.uid:
|
||||
return http.local_redirect('/web/login?redirect=/barcode/web')
|
||||
|
||||
r = html_template % {
|
||||
'modules': simplejson.dumps(module_boot(request.db)),
|
||||
'init': """
|
||||
var wc = new s.web.WebClient();
|
||||
wc.show_application = function(){
|
||||
wc.action_manager.do_action("stock.ui", {});
|
||||
};
|
||||
wc.do_push_state = function(state){};
|
||||
wc.setElement($(document.body));
|
||||
wc.start();
|
||||
"""
|
||||
}
|
||||
return r
|
||||
return request.render('stock.barcode_index')
|
||||
|
|
|
|||
|
|
@ -3,11 +3,64 @@
|
|||
-->
|
||||
<openerp>
|
||||
<data>
|
||||
<template id="assets_backend" name="stock assets" inherit_id="web.assets_backend">
|
||||
<xpath expr="." position="inside">
|
||||
<link rel="stylesheet" href="/stock/static/src/css/stock.css"/>
|
||||
<script type="text/javascript" src="/stock/static/src/js/widgets.js"></script>
|
||||
</xpath>
|
||||
</template>
|
||||
|
||||
<template id="assets_backend" name="stock assets" inherit_id="web.assets_backend">
|
||||
<xpath expr="." position="inside">
|
||||
<link rel="stylesheet" href="/stock/static/src/css/stock.css"/>
|
||||
<script type="text/javascript" src="/stock/static/src/js/widgets.js"></script>
|
||||
</xpath>
|
||||
</template>
|
||||
|
||||
<template id="barcode_index" name="Barcode Scanner"><!DOCTYPE html>
|
||||
<html>
|
||||
<head>
|
||||
<title>Barcode Scanner</title>
|
||||
|
||||
<meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1"/>
|
||||
<meta http-equiv="content-type" content="text/html, charset=utf-8" />
|
||||
|
||||
<meta name="viewport" content=" width=1024, user-scalable=no"/>
|
||||
<meta name="apple-mobile-web-app-capable" content="yes"/>
|
||||
<meta name="mobile-web-app-capable" content="yes"/>
|
||||
|
||||
<link rel="shortcut icon" sizes="80x51" href="/stock/static/src/img/scan.png"/>
|
||||
<link rel="shortcut icon" href="/web/static/src/img/favicon.ico" type="image/x-icon"/>
|
||||
|
||||
<link rel="stylesheet" href="/stock/static/src/css/barcode.css" />
|
||||
<link rel="stylesheet" href="/web/static/lib/bootstrap/css/bootstrap.css" />
|
||||
<link rel="stylesheet" href="/web/static/lib/jquery.ui/css/smoothness/jquery-ui-1.9.1.custom.css" />
|
||||
<link rel="stylesheet" href="/web/static/lib/fontawesome/css/font-awesome.css" />
|
||||
|
||||
<t t-call-assets="web.assets_common" t-css="false" />
|
||||
<t t-call-assets="web.assets_backend" t-css="false" />
|
||||
|
||||
<script type="text/javascript" id="loading-script" t-raw="init">
|
||||
$(function() {
|
||||
var s = new openerp.init();
|
||||
var wc = new s.web.WebClient();
|
||||
|
||||
wc.show_application = function() {
|
||||
wc.action_manager.do_action("stock.ui", {});
|
||||
};
|
||||
|
||||
wc.do_push_state = function(state){};
|
||||
wc.setElement($(document.body));
|
||||
wc.start();
|
||||
});
|
||||
</script>
|
||||
|
||||
</head>
|
||||
<body>
|
||||
<div class='openerp openerp_webclient_container'>
|
||||
<table class='oe_webclient'>
|
||||
<tr>
|
||||
<td class='oe_application' />
|
||||
</tr>
|
||||
</table>
|
||||
</div>
|
||||
</body>
|
||||
</html>
|
||||
</template>
|
||||
|
||||
</data>
|
||||
</openerp>
|
||||
|
|
|
|||
Loading…
Reference in New Issue