renames part6 partially working
bzr revid: al@openerp.com-20110330143556-yogu79hyy5oojdvq
This commit is contained in:
Antony Lesuisse
parent
316d13143f
commit
c7e2d214ad
|
|
@ -5,27 +5,35 @@
|
|||
<title>OpenERP</title>
|
||||
<link rel="shortcut icon" href="/base/static/openerp/img/favicon.ico" type="image/x-icon"/>
|
||||
|
||||
<link rel="stylesheet" type="text/css" media="screen" href="/base/static/jquery.ui/css/smoothness/jquery-ui-1.8.9.custom.css" />
|
||||
<link rel="stylesheet" type="text/css" media="screen" href="/base/static/jquery.jqGrid/css/ui.jqgrid.css" />
|
||||
<link rel="stylesheet" type="text/css" href="/base/static/jquery.superfish/css/superfish.css" media="screen">
|
||||
<link rel="stylesheet" href="/base/static/openerp/base.css" type="text/css"/>
|
||||
<link rel="stylesheet" type="text/css" media="screen" href="/base/static/src/jquery.ui/css/smoothness/jquery-ui-1.8.9.custom.css" />
|
||||
<link rel="stylesheet" type="text/css" media="screen" href="/base/static/src/jquery.jqGrid/css/ui.jqgrid.css" />
|
||||
<link rel="stylesheet" type="text/css" href="/base/static/src/jquery.superfish/css/superfish.css" media="screen">
|
||||
<link rel="stylesheet" href="/base/static/src/css/base.css" type="text/css"/>
|
||||
|
||||
<script type="text/javascript" src="/base/static/LABjs/LAB.js"></script>
|
||||
<script type="text/javascript" src="/base/static/lib/LABjs/LAB.js"></script>
|
||||
<script>
|
||||
$LAB
|
||||
.setOptions({UsePreloading:false})
|
||||
.script('/base/static/openerp/js/base.js')
|
||||
.script('/base/static/qweb/qweb.js')
|
||||
.script('/base/static/underscore/underscore.js')
|
||||
.script('/base/static/jquery/jquery-1.5.1.js')
|
||||
.script('/base/static/lib/qweb/qweb.js')
|
||||
.script('/base/static/lib/underscore/underscore.js')
|
||||
.script('/base/static/lib/jquery/jquery-1.5.1.js')
|
||||
.wait()
|
||||
.script('/base/static/jquery.ui/js/jquery-ui-1.8.9.custom.min.js')
|
||||
.wait()
|
||||
.script('/base/static/jquery.jqGrid/jquery.jqGrid.js')
|
||||
.script('/base/static/jquery.superfish/js/hoverIntent.js')
|
||||
.script('/base/static/openerp/js/base_chrome.js')
|
||||
.script('/base/static/openerp/js/base_views.js')
|
||||
.wait()
|
||||
.script('/base/static/jquery.superfish/js/superfish.js')
|
||||
.wait()
|
||||
.script('/base/static/src/js/base.js')
|
||||
.wait()
|
||||
.script('/base/static/src/js/chrome.js')
|
||||
.script('/base/static/src/js/data.js')
|
||||
.script('/base/static/src/js/form.js')
|
||||
.script('/base/static/src/js/list.js')
|
||||
.script('/base/static/src/js/search.js')
|
||||
.script('/base/static/src/js/views.js')
|
||||
.wait()
|
||||
.wait(function() {
|
||||
var oe = openerp.init();
|
||||
oe.base.webclient("oe");
|
||||
|
|
|
|||
|
|
@ -71,14 +71,12 @@
|
|||
var session_counter = 0;
|
||||
|
||||
var openerp = this.openerp = {
|
||||
// addons registry
|
||||
addons: {},
|
||||
// element_ids registry linked to all controllers on the page
|
||||
// TODO rename to elements, or keep gtk naming?
|
||||
screen: {},
|
||||
// Per session namespace
|
||||
// openerp.<module> will map to
|
||||
// openerp.sessions.servername_port_dbname_login.<module> using a closure
|
||||
// openerp.sessions.sessionname.<module> using a closure
|
||||
sessions: {},
|
||||
// openerp instance constructor
|
||||
init: function() {
|
||||
|
|
@ -103,12 +101,16 @@
|
|||
})();
|
||||
|
||||
//---------------------------------------------------------
|
||||
// OpenERP initialisation and black magic about the pool
|
||||
// OpenERP base module split
|
||||
//---------------------------------------------------------
|
||||
|
||||
openerp.base = function(instance) {
|
||||
openerp.base$chrome(instance);
|
||||
openerp.base$views(instance);
|
||||
openerp.base.chrome(instance);
|
||||
openerp.base.data(instance);
|
||||
openerp.base.views(instance);
|
||||
openerp.base.search(instance);
|
||||
openerp.base.list(instance);
|
||||
openerp.base.form(instance);
|
||||
};
|
||||
|
||||
// vim:et fdc=0 fdl=0 foldnestmax=3 fdm=syntax:
|
||||
|
|
|
|||
|
|
@ -2,7 +2,7 @@
|
|||
* OpenERP base library
|
||||
*---------------------------------------------------------*/
|
||||
|
||||
openerp.addons.base.chrome = function(openerp) {
|
||||
openerp.base.chrome = function(openerp) {
|
||||
|
||||
openerp.base.callback = function(obj, method) {
|
||||
// openerp.base.callback( obj, methods, [arg1, arg2, ... ] )
|
||||
|
|
@ -517,7 +517,7 @@ openerp.base.WebClient = openerp.base.Controller.extend({
|
|||
var self = this;
|
||||
this._super(null, element_id);
|
||||
|
||||
QWeb.add_template("base.xml");
|
||||
QWeb.add_template("xml/base.xml");
|
||||
this.$element.html(QWeb.render("Interface", {}));
|
||||
|
||||
this.session = new openerp.base.Session("oe_errors");
|
||||
|
|
|
|||
|
|
@ -1,5 +1,6 @@
|
|||
|
||||
openerp.addons.base.data = function(openerp) {
|
||||
openerp.base.data = function(openerp) {
|
||||
|
||||
/**
|
||||
* Management interface between views and the collection of selected OpenERP
|
||||
* records (represents the view's state?)
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
|
||||
openerp.addons.base.form = function (openerp) {
|
||||
openerp.base.form = function (openerp) {
|
||||
|
||||
openerp.base.FormView = openerp.base.Controller.extend({
|
||||
init: function(session, element_id, dataset, view_id) {
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
|
||||
openerp.addons.base.form = function (openerp) {
|
||||
openerp.base.list = function (openerp) {
|
||||
|
||||
openerp.base.ListView = openerp.base.Controller.extend({
|
||||
init: function(session, element_id, dataset, view_id) {
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
openerp.addons.base.views = function(openerp) {
|
||||
openerp.base.search = function(openerp) {
|
||||
|
||||
openerp.base.SearchView = openerp.base.Controller.extend({
|
||||
init: function(session, element_id, dataset, view_id, defaults) {
|
||||
|
|
|
|||
|
|
@ -2,7 +2,7 @@
|
|||
* OpenERP base library
|
||||
*---------------------------------------------------------*/
|
||||
|
||||
openerp.addons.base.views = function(openerp) {
|
||||
openerp.base.views = function(openerp) {
|
||||
|
||||
// process all kind of actions
|
||||
openerp.base.ActionManager = openerp.base.Controller.extend({
|
||||
|
|
|
|||
|
|
@ -1,12 +1,12 @@
|
|||
#!/usr/bin/python
|
||||
import datetime
|
||||
import dateutil.relativedelta
|
||||
import functools
|
||||
import optparse
|
||||
import time
|
||||
import dateutil.relativedelta
|
||||
import os
|
||||
import sys
|
||||
import tempfile
|
||||
import time
|
||||
import traceback
|
||||
import uuid
|
||||
import xmlrpclib
|
||||
|
|
@ -24,15 +24,12 @@ import xmlrpctimeout
|
|||
class OpenERPUnboundException(Exception):
|
||||
pass
|
||||
|
||||
|
||||
class OpenERPConnector(object):
|
||||
pass
|
||||
|
||||
|
||||
class OpenERPAuth(object):
|
||||
pass
|
||||
|
||||
|
||||
class OpenERPModel(object):
|
||||
def __init__(self, session, model):
|
||||
self._session = session
|
||||
|
|
@ -41,7 +38,6 @@ class OpenERPModel(object):
|
|||
def __getattr__(self, name):
|
||||
return lambda *l:self._session.execute(self._model, name, *l)
|
||||
|
||||
|
||||
class OpenERPSession(object):
|
||||
"""
|
||||
An OpenERP RPC session, a given user can own multiple such sessions
|
||||
|
|
@ -254,7 +250,6 @@ class OpenERPSession(object):
|
|||
#----------------------------------------------------------
|
||||
# OpenERP Web RequestHandler
|
||||
#----------------------------------------------------------
|
||||
|
||||
class JsonRequest(object):
|
||||
""" JSON-RPC2 over HTTP POST using non standard POST encoding.
|
||||
Difference with the standard:
|
||||
|
|
@ -348,7 +343,6 @@ class JsonRequest(object):
|
|||
cherrypy.response.headers['Content-Length'] = len(content)
|
||||
return content
|
||||
|
||||
|
||||
def jsonrequest(f):
|
||||
@cherrypy.expose
|
||||
@functools.wraps(f)
|
||||
|
|
@ -357,7 +351,6 @@ def jsonrequest(f):
|
|||
|
||||
return json_handler
|
||||
|
||||
|
||||
class HttpRequest(object):
|
||||
""" Regular GET/POST request
|
||||
"""
|
||||
|
|
@ -372,7 +365,6 @@ class HttpRequest(object):
|
|||
r = f(controller, self, request)
|
||||
return r
|
||||
|
||||
|
||||
def httprequest(f):
|
||||
# check cleaner wrapping:
|
||||
# functools.wraps(f)(lambda x: JsonRequest().dispatch(x, f))
|
||||
|
|
@ -400,11 +392,9 @@ class ControllerType(type):
|
|||
super(ControllerType, cls).__init__(name, bases, attrs)
|
||||
controllers_class["%s.%s" % (cls.__module__, cls.__name__)] = cls
|
||||
|
||||
|
||||
class Controller(object):
|
||||
__metaclass__ = ControllerType
|
||||
|
||||
|
||||
class Root(object):
|
||||
def __init__(self):
|
||||
self.addons = {}
|
||||
|
|
@ -449,10 +439,9 @@ class Root(object):
|
|||
return m(**kw)
|
||||
raise cherrypy.NotFound('/' + '/'.join(l))
|
||||
else:
|
||||
raise cherrypy.HTTPRedirect('/base/static/openerp/base.html', 301)
|
||||
raise cherrypy.HTTPRedirect('/base/static/src/base.html', 301)
|
||||
default.exposed = True
|
||||
|
||||
|
||||
def main(argv):
|
||||
# Parse config
|
||||
op = optparse.OptionParser()
|
||||
|
|
|
|||
Loading…
Reference in New Issue