[IMP] moved openerpweb into base.common to be renamed web.commom
bzr revid: al@openerp.com-20110830232300-0f4hb3pk3jso0dii
This commit is contained in:
parent
d47382ce7d
commit
974305d697
|
@ -1 +1,6 @@
|
|||
import common
|
||||
import controllers
|
||||
|
||||
# TODO
|
||||
# if we detect that we are imported from the openerp server register common.Root() as a wsgi entry point
|
||||
|
||||
|
|
|
@ -23,8 +23,10 @@ import logging
|
|||
# Globals
|
||||
#-----------------------------------------------------------
|
||||
|
||||
path_root = os.path.dirname(os.path.dirname(os.path.normpath(__file__)))
|
||||
path_addons = os.path.join(path_root, 'addons')
|
||||
import __main__
|
||||
|
||||
path_root = __main__.path_root
|
||||
path_addons = __main__.path_addons
|
||||
cherrypy_root = None
|
||||
|
||||
#-----------------------------------------------------------
|
||||
|
@ -425,12 +427,16 @@ class Root(object):
|
|||
controllers_path[o._cp_path] = o
|
||||
|
||||
def default(self, *l, **kw):
|
||||
#print "default",l,kw
|
||||
print "default",l,kw
|
||||
# handle static files
|
||||
if len(l) > 2 and l[1] == 'static':
|
||||
# sanitize path
|
||||
p = os.path.normpath(os.path.join(*l))
|
||||
return cherrypy.lib.static.serve_file(os.path.join(path_addons, p))
|
||||
p2 = os.path.join(path_addons, p)
|
||||
print "p",p
|
||||
print "p2",p2
|
||||
|
||||
return cherrypy.lib.static.serve_file(p2)
|
||||
elif len(l) > 1:
|
||||
for i in range(len(l), 1, -1):
|
||||
ps = "/" + "/".join(l[0:i])
|
|
@ -15,9 +15,11 @@ from cStringIO import StringIO
|
|||
|
||||
import cherrypy
|
||||
|
||||
import openerpweb
|
||||
import openerpweb.ast
|
||||
import openerpweb.nonliterals
|
||||
import base.common as openerpweb
|
||||
import base.common.ast
|
||||
import base.common.nonliterals
|
||||
openerpweb.ast = base.common.ast
|
||||
openerpweb.nonliterals = base.common.nonliterals
|
||||
|
||||
from babel.messages.pofile import read_po
|
||||
|
||||
|
|
|
@ -1,5 +1,6 @@
|
|||
import base.common as openerpweb
|
||||
|
||||
from base.controllers.main import View
|
||||
import openerpweb
|
||||
|
||||
class CalendarView(View):
|
||||
_cp_path = "/base_calendar/calendarview"
|
||||
|
|
|
@ -1,5 +1,5 @@
|
|||
# -*- coding: utf-8 -*-
|
||||
import openerpweb
|
||||
import base.common as openerpweb
|
||||
|
||||
WIDGET_CONTENT_PATTERN = """<!DOCTYPE html>
|
||||
<html>
|
||||
|
|
|
@ -1,5 +1,5 @@
|
|||
import base.common as openerpweb
|
||||
from base.controllers.main import View
|
||||
import openerpweb
|
||||
|
||||
class DiagramView(View):
|
||||
_cp_path = "/base_diagram/diagram"
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
import openerpweb
|
||||
import base.common as openerpweb
|
||||
from base.controllers.main import View
|
||||
|
||||
class GanttView(View):
|
||||
|
|
|
@ -1,5 +1,5 @@
|
|||
from base.controllers.main import View
|
||||
import openerpweb
|
||||
import base.common as openerpweb
|
||||
|
||||
class GraphView(View):
|
||||
_cp_path = "/base_graph/graphview"
|
||||
|
|
|
@ -4,7 +4,7 @@ import cherrypy
|
|||
|
||||
import simplejson
|
||||
import random
|
||||
import openerpweb
|
||||
import base.common as openerpweb
|
||||
|
||||
#----------------------------------------------------------
|
||||
# OpenERP Web ajaxim Controllers
|
||||
|
|
|
@ -1,12 +1,12 @@
|
|||
# -*- coding: utf-8 -*-
|
||||
import glob, os
|
||||
import pprint
|
||||
|
||||
import simplejson
|
||||
|
||||
import openerpweb
|
||||
import openerpweb.ast
|
||||
import openerpweb.nonliterals
|
||||
|
||||
import cherrypy
|
||||
|
||||
#import glob, os
|
||||
#import pprint
|
||||
#
|
||||
#import simplejson
|
||||
#
|
||||
#import openerpweb
|
||||
#import openerpweb.ast
|
||||
#import openerpweb.nonliterals
|
||||
#
|
||||
#import cherrypy
|
||||
#
|
||||
|
|
|
@ -1,7 +1,12 @@
|
|||
#!/usr/bin/env python
|
||||
import sys
|
||||
import os,sys
|
||||
|
||||
import openerpweb
|
||||
path_root = os.path.dirname(os.path.abspath(__file__))
|
||||
path_addons = os.path.join(path_root, 'addons')
|
||||
if path_addons not in sys.path:
|
||||
sys.path.insert(0, path_addons)
|
||||
|
||||
import base
|
||||
|
||||
if __name__ == "__main__":
|
||||
openerpweb.main(sys.argv)
|
||||
base.common.main(sys.argv)
|
||||
|
|
Loading…
Reference in New Issue