openerp-dev-web team mailing list archive
-
openerp-dev-web team
-
Mailing list archive
-
Message #00028
[Merge] lp:~openerp-dev-web/openobject-client-web/cp_path into lp:~openerp-dev/openobject-client-web/trunk-dev-web
vda(Open ERP) has proposed merging lp:~openerp-dev-web/openobject-client-web/cp_path into lp:~openerp-dev/openobject-client-web/trunk-dev-web.
Requested reviews:
OpenERP SA's Web Client R&D (openerp-dev-web)
--
https://code.launchpad.net/~openerp-dev-web/openobject-client-web/cp_path/+merge/25214
Your team OpenERP SA's Web Client R&D is requested to review the proposed merge of lp:~openerp-dev-web/openobject-client-web/cp_path into lp:~openerp-dev/openobject-client-web/trunk-dev-web.
=== renamed file 'addons/openerp/__terp__.py' => 'addons/openerp/__openerp__.py'
=== modified file 'addons/openerp/controllers/attachment.py'
--- addons/openerp/controllers/attachment.py 2010-03-08 11:44:48 +0000
+++ addons/openerp/controllers/attachment.py 2010-05-13 10:19:23 +0000
@@ -36,7 +36,7 @@
class Attachment(SecuredController):
- _cp_path = "/attachment"
+ _cp_path = "/openerp/attachment"
@expose()
def index(self, model, id):
=== modified file 'addons/openerp/controllers/database.py'
--- addons/openerp/controllers/database.py 2010-03-29 05:47:49 +0000
+++ addons/openerp/controllers/database.py 2010-05-13 10:19:23 +0000
@@ -129,11 +129,11 @@
class Database(BaseController):
- _cp_path = "/database"
+ _cp_path = "/openerp/database"
@expose()
def index(self, *args, **kw):
- raise redirect('/database/create')
+ raise redirect('/openerp/database/create')
@expose(template="templates/database.mako")
def create(self, tg_errors=None, **kw):
@@ -176,8 +176,8 @@
raise common.warning(_("Could not create database."))
if ok:
- raise redirect('/menu', {'db': True})
- raise redirect('/login', db=dbname)
+ raise redirect('/openerp/menu', {'db': True})
+ raise redirect('/openerp/login', db=dbname)
@expose(template="templates/database.mako")
def drop(self, tg_errors=None, **kw):
@@ -196,7 +196,7 @@
else:
raise common.warning(_("Couldn't drop database"))
- raise redirect("/database/drop")
+ raise redirect("/openerp/database/drop")
@expose(template="templates/database.mako")
def backup(self, tg_errors=None, **kw):
@@ -216,7 +216,7 @@
except Exception, e:
raise common.warning(_("Could not create backup."))
- raise redirect('/login')
+ raise redirect('/openerp/login')
@expose(template="templates/database.mako")
def restore(self, tg_errors=None, **kw):
@@ -236,7 +236,7 @@
else:
raise common.warning(_("Couldn't restore database"))
- raise redirect('/login', db=dbname)
+ raise redirect('/openerp/login', db=dbname)
@expose(template="templates/database.mako")
def password(self, tg_errors=None, **kw):
@@ -255,7 +255,7 @@
else:
raise common.warning(_("Error, password not changed."))
- raise redirect('/login')
+ raise redirect('/openerp/login')
# vim: ts=4 sts=4 sw=4 si et
=== modified file 'addons/openerp/controllers/error_page.py'
--- addons/openerp/controllers/error_page.py 2010-03-08 11:44:48 +0000
+++ addons/openerp/controllers/error_page.py 2010-05-13 10:19:23 +0000
@@ -38,13 +38,13 @@
class ErrorPage(BaseController):
- _cp_path = "/errorpage"
+ _cp_path = "/openerp/errorpage"
nb = widgets.form.Notebook()
@expose()
def index(self, *args, **kw):
- raise redirect('/')
+ raise redirect('/openerp')
def render(self):
etype, value, tb = sys.exc_info()
@@ -68,7 +68,7 @@
title=value.title
error=value.message
- target = cherrypy.request.path_info or '/form/save'
+ target = cherrypy.request.path_info or '/openerp/form/save'
if isinstance(value, common.Concurrency):
concurrency = True
=== modified file 'addons/openerp/controllers/fieldpref.py'
--- addons/openerp/controllers/fieldpref.py 2010-03-08 11:44:48 +0000
+++ addons/openerp/controllers/fieldpref.py 2010-05-13 10:19:23 +0000
@@ -33,7 +33,7 @@
class FieldPref(SecuredController):
- _cp_path = "/fieldpref"
+ _cp_path = "/openerp/fieldpref"
@expose(template="templates/fieldpref.mako")
def index(self, **kw): #_terp_model, _terp_field, _terp_deps
=== modified file 'addons/openerp/controllers/form.py'
--- addons/openerp/controllers/form.py 2010-04-27 10:23:57 +0000
+++ addons/openerp/controllers/form.py 2010-05-13 10:19:23 +0000
@@ -177,7 +177,7 @@
class Form(SecuredController):
- _cp_path = "/form"
+ _cp_path = "/openerp/form"
def create_form(self, params, tg_errors=None):
if tg_errors:
@@ -188,7 +188,7 @@
params.count = params.count or 0
params.view_type = params.view_type or params.view_mode[0]
- return tw.form_view.ViewForm(params, name="view_form", action="/form/save")
+ return tw.form_view.ViewForm(params, name="view_form", action="/openerp/form/save")
@expose(template="templates/form.mako")
def create(self, params, tg_errors=None):
@@ -1063,7 +1063,7 @@
def can_shortcut_create(self):
return (rpc.session.is_logged() and
rpc.session.active_id and
- cherrypy.request.path_info == '/tree/open' and
+ cherrypy.request.path_info == '/openerp/tree/open' and
cherrypy.request.params.get('model') == 'ir.ui.menu')
@expose()
=== modified file 'addons/openerp/controllers/image.py'
--- addons/openerp/controllers/image.py 2010-03-08 11:44:48 +0000
+++ addons/openerp/controllers/image.py 2010-05-13 10:19:23 +0000
@@ -38,7 +38,7 @@
class Image(SecuredController):
- _cp_path = "/image"
+ _cp_path = "/openerp/image"
@expose(template="templates/image.mako")
def index(self, **kw):
@@ -123,7 +123,7 @@
res = res.get(field)
if not res:
- raise redirect('/image', **kw)
+ raise redirect('/openerp/image', **kw)
return base64.decodestring(res)
=== modified file 'addons/openerp/controllers/impex.py'
--- addons/openerp/controllers/impex.py 2010-03-08 11:44:48 +0000
+++ addons/openerp/controllers/impex.py 2010-05-13 10:19:23 +0000
@@ -111,7 +111,7 @@
class ImpEx(SecuredController):
- _cp_path = "/impex"
+ _cp_path = "/openerp/impex"
@expose(template="templates/exp.mako")
def exp(self, **kw):
@@ -130,7 +130,7 @@
tree = treegrid.TreeGrid('export_fields',
model=params.model,
headers=headers,
- url=tools.url('/impex/get_fields'),
+ url=tools.url('/openerp/impex/get_fields'),
field_parent='relation',
views=views)
@@ -160,7 +160,7 @@
selected_list = [selected_list]
proxy.create({'name' : name, 'resource' : params.model, 'export_fields' : [(0, 0, {'name' : f}) for f in selected_list]})
- raise redirect('/impex/exp', **kw)
+ raise redirect('/openerp/impex/exp', **kw)
@expose()
def delete_listname(self, **kw):
@@ -170,7 +170,7 @@
proxy.unlink(params.id)
- raise redirect('/impex/exp', **kw)
+ raise redirect('/openerp/impex/exp', **kw)
@expose('json')
def get_fields(self, model, prefix='', name='', field_parent=None, **kw):
@@ -400,7 +400,7 @@
tree = treegrid.TreeGrid('import_fields',
model=params.model,
headers=headers,
- url=tools.url('/impex/get_fields'),
+ url=tools.url('/openerp/impex/get_fields'),
field_parent='relation',
views=views,
is_importing=1)
=== modified file 'addons/openerp/controllers/listgrid.py'
--- addons/openerp/controllers/listgrid.py 2010-05-10 12:50:52 +0000
+++ addons/openerp/controllers/listgrid.py 2010-05-13 10:19:23 +0000
@@ -38,7 +38,7 @@
class List(SecuredController):
- _cp_path = "/listgrid"
+ _cp_path = "/openerp/listgrid"
@expose('json')
def save(self, **kw):
=== modified file 'addons/openerp/controllers/modules.py'
--- addons/openerp/controllers/modules.py 2010-03-08 11:44:48 +0000
+++ addons/openerp/controllers/modules.py 2010-05-13 10:19:23 +0000
@@ -6,7 +6,7 @@
class ModuleForm(form.Form):
- _cp_path = "/modules"
+ _cp_path = "/openerp/modules"
@expose(template="templates/modules.mako")
def create(self, params, tg_errors=None):
=== modified file 'addons/openerp/controllers/openm2m.py'
--- addons/openerp/controllers/openm2m.py 2010-03-08 11:44:48 +0000
+++ addons/openerp/controllers/openm2m.py 2010-05-13 10:19:23 +0000
@@ -36,7 +36,7 @@
class OpenM2M(Form):
- _cp_path = "/openm2m"
+ _cp_path = "/openerp/openm2m"
@expose(template="templates/openm2m.mako")
def create(self, params, tg_errors=None):
=== modified file 'addons/openerp/controllers/openm2o.py'
--- addons/openerp/controllers/openm2o.py 2010-03-08 11:44:48 +0000
+++ addons/openerp/controllers/openm2o.py 2010-05-13 10:19:23 +0000
@@ -36,7 +36,7 @@
class OpenM2O(Form):
- _cp_path = "/openm2o"
+ _cp_path = "/openerp/openm2o"
@expose(template="templates/openm2o.mako")
def create(self, params, tg_errors=None):
=== modified file 'addons/openerp/controllers/openo2m.py'
--- addons/openerp/controllers/openo2m.py 2010-04-27 10:23:57 +0000
+++ addons/openerp/controllers/openo2m.py 2010-05-13 10:19:23 +0000
@@ -38,7 +38,7 @@
class OpenO2M(Form):
- _cp_path = "/openo2m"
+ _cp_path = "/openerp/openo2m"
def create_form(self, params, tg_errors=None):
@@ -58,7 +58,7 @@
# auto increment of sequence
vp.id = params.parent_id or False
- form = tw.form_view.ViewForm(vp, name="view_form", action="/openo2m/save")
+ form = tw.form_view.ViewForm(vp, name="view_form", action="/openerp/openo2m/save")
cherrypy.request.terp_validators = {}
wid = form.screen.widget.get_widgets_by_name(params.o2m)[0]
@@ -100,7 +100,7 @@
tw.form.Hidden(name='_terp_o2m_context', default=ustr(params.o2m_context or {})),
tw.form.Hidden(name=params.prefix + '/__id', default=params.id or None)] + hiddens
- form = tw.form_view.ViewForm(params, name="view_form", action="/openo2m/save")
+ form = tw.form_view.ViewForm(params, name="view_form", action="/openerp/openo2m/save")
form.screen.string = wid.screen.string
return form
=== modified file 'addons/openerp/controllers/preferences.py'
--- addons/openerp/controllers/preferences.py 2010-05-03 11:09:39 +0000
+++ addons/openerp/controllers/preferences.py 2010-05-13 10:19:23 +0000
@@ -36,7 +36,7 @@
class Preferences(Form):
- _cp_path = "/pref"
+ _cp_path = "/openerp/pref"
@expose(template="templates/preferences.mako")
def create(self):
@@ -76,11 +76,11 @@
proxy = rpc.RPCProxy('res.users')
proxy.write([rpc.session.uid], data)
rpc.session.context_reload()
- raise redirect('/pref/create')
+ raise redirect('/openerp/pref/create')
@expose()
def clear_cache(self):
cache.clear()
- raise redirect('/blank')
+ raise redirect('/openerp/blank')
# vim: ts=4 sts=4 sw=4 si et
=== modified file 'addons/openerp/controllers/requests.py'
--- addons/openerp/controllers/requests.py 2010-03-08 11:44:48 +0000
+++ addons/openerp/controllers/requests.py 2010-05-13 10:19:23 +0000
@@ -35,7 +35,7 @@
class Requests(SecuredController):
- _cp_path = "/requests"
+ _cp_path = "/openerp/requests"
def my(self):
=== modified file 'addons/openerp/controllers/root.py'
--- addons/openerp/controllers/root.py 2010-05-06 06:24:46 +0000
+++ addons/openerp/controllers/root.py 2010-05-13 10:19:23 +0000
@@ -35,7 +35,7 @@
def _cp_on_error():
- errorpage = cherrypy.request.pool.get_controller("/errorpage")
+ errorpage = cherrypy.request.pool.get_controller("/openerp/errorpage")
message = errorpage.render()
cherrypy.response.status = 500
#cherrypy.response.headers['Content-Type'] = 'text/html'
@@ -45,13 +45,13 @@
class Root(SecuredController):
- _cp_path = "/"
+ _cp_path = "/openerp"
@expose()
def index(self):
"""Index page, loads the view defined by `action_id`.
"""
- raise redirect("/menu")
+ raise redirect("/openerp/menu")
def user_action(self, id='action_id'):
"""Perform default user action.
@@ -65,7 +65,7 @@
if not act_id[0][id]:
common.warning(_('You can not log into the system!\nAsk the administrator to verify\nyou have an action defined for your user.'), _('Access Denied!'))
rpc.session.logout()
- raise redirect('/');
+ raise redirect('/openerp');
else:
act_id = act_id[0][id][0]
from openerp import controllers
@@ -125,14 +125,14 @@
tool['tree'] = tree = tree_view.ViewTree(view, 'ir.ui.menu', tid,
domain=[('parent_id', '=', tid)],
- context=ctx, action="/tree/action", fields=fields)
+ context=ctx, action="/openerp/tree/action", fields=fields)
tree._name = "tree_%s" %(tid)
tree.tree.onselection = None
tree.tree.onheaderclick = None
tree.tree.showheaders = 0
tree.tree.linktarget = "'appFrame'"
if kw.get('db'):
- return dict(parents=parents, tools=tools, setup = '/home')
+ return dict(parents=parents, tools=tools, setup = '/openerp/home')
return dict(parents=parents, tools=tools)
@expose(allow_json=True)
@@ -140,7 +140,7 @@
def login(self, db=None, user=None, password=None, style=None, location=None, **kw):
location = url(location or '/', kw or {})
-
+ print "\n\n\n Loacation in login root.py...",location
if db and user and user.startswith("anonymous"):
if rpc.session.login(db, user, password):
raise redirect(location)
@@ -162,7 +162,7 @@
""" Logout method, will terminate the current session.
"""
rpc.session.logout()
- raise redirect('/')
+ raise redirect('/openerp')
@expose(template="templates/about.mako")
@unsecured
=== modified file 'addons/openerp/controllers/search.py'
--- addons/openerp/controllers/search.py 2010-05-10 09:05:26 +0000
+++ addons/openerp/controllers/search.py 2010-05-13 10:19:23 +0000
@@ -35,7 +35,7 @@
class Search(Form):
- _cp_path = "/search"
+ _cp_path = "/openerp/search"
@expose(template="templates/search.mako")
def create(self, params, tg_errors=None):
=== modified file 'addons/openerp/controllers/selection.py'
--- addons/openerp/controllers/selection.py 2010-03-08 11:44:48 +0000
+++ addons/openerp/controllers/selection.py 2010-05-13 10:19:23 +0000
@@ -34,7 +34,7 @@
class Selection(SecuredController):
- _cp_path = "/selection"
+ _cp_path = "/openerp/selection"
@expose(template="templates/selection.mako")
def create(self, values, **data):
=== modified file 'addons/openerp/controllers/shortcuts.py'
--- addons/openerp/controllers/shortcuts.py 2010-04-20 11:16:15 +0000
+++ addons/openerp/controllers/shortcuts.py 2010-05-13 10:19:23 +0000
@@ -35,7 +35,7 @@
class Shortcuts(SecuredController):
- _cp_path = "/shortcuts"
+ _cp_path = "/openerp/shortcuts"
def my(self):
@@ -59,13 +59,13 @@
<div id="shortcuts_submenu">
% for sc in new_shortcuts:
% if type(sc['res_id']) == type(()):
- <a target="appFrame" href="${py.url('/tree/open', id=sc['res_id'][0], model='ir.ui.menu')}" style="height: 10px; padding: 0 2px 8px 5px;">${sc['name']}</a>
+ <a target="appFrame" href="${py.url('/openerp/tree/open', id=sc['res_id'][0], model='ir.ui.menu')}" style="height: 10px; padding: 0 2px 8px 5px;">${sc['name']}</a>
% else:
- <a target="appFrame" href="${py.url('/tree/open', id=sc['res_id'], model='ir.ui.menu')}" style="height: 10px; padding: 0 2px 8px 5px;">${sc['name']}</a>
+ <a target="appFrame" href="${py.url('/openerp/tree/open', id=sc['res_id'], model='ir.ui.menu')}" style="height: 10px; padding: 0 2px 8px 5px;">${sc['name']}</a>
% endif
% endfor
<hr id="shortcut_sep" style="border: none; border-top: dashed 1px #CCCCCC; color: #FFFFFF; background-color: #FFFFFF; height: 1px; padding: 0px"/>
- <a id="manage_shortcuts" target='appFrame' href="/shortcuts" style="height: 10px; padding: 0 2px 8px 5px;">${_("Manage Shortcuts")}</a>
+ <a id="manage_shortcuts" target='appFrame' href="/openerp/shortcuts" style="height: 10px; padding: 0 2px 8px 5px;">${_("Manage Shortcuts")}</a>
</div>
""")
def get_shortcuts(self):
@@ -89,9 +89,9 @@
for s in sc:
if isinstance(s['res_id'], tuple):
if s['res_id'][0] == id:
- raise redirect('/tree/open', id=id, model='ir.ui.menu')
+ raise redirect('/openerp/tree/open', id=id, model='ir.ui.menu')
elif s['res_id'] == id:
- raise redirect('/tree/open', id=id, model='ir.ui.menu')
+ raise redirect('/openerp/tree/open', id=id, model='ir.ui.menu')
name = rpc.RPCProxy('ir.ui.menu').name_get([id], rpc.session.context)[0][1]
proxy.create({'user_id': rpc.session.uid, 'res_id': id, 'resource': 'ir.ui.menu', 'name': name})
@@ -99,6 +99,6 @@
sc = proxy.get_sc(rpc.session.uid, 'ir.ui.menu', rpc.session.context)
cherrypy.session['terp_shortcuts'] = sc
- raise redirect('/tree/open', id=id, model='ir.ui.menu')
+ raise redirect('/openerp/tree/open', id=id, model='ir.ui.menu')
# vim: ts=4 sts=4 sw=4 si et
=== modified file 'addons/openerp/controllers/templates/closepopup.mako'
--- addons/openerp/controllers/templates/closepopup.mako 2010-04-28 12:11:43 +0000
+++ addons/openerp/controllers/templates/closepopup.mako 2010-05-13 10:19:23 +0000
@@ -7,8 +7,8 @@
window.opener.location.reload();
window.close();
} else {
- openobject.http.redirect('/blank');
- window.parent.location.href = '/menu';
+ openobject.http.redirect('/openerp/blank');
+ window.parent.location.href = '/openerp/menu';
}
});
</script>
=== modified file 'addons/openerp/controllers/templates/database.mako'
--- addons/openerp/controllers/templates/database.mako 2010-01-28 08:54:33 +0000
+++ addons/openerp/controllers/templates/database.mako 2010-05-13 10:19:23 +0000
@@ -17,7 +17,7 @@
});
var dbView = function(name) {
- window.location.href = "${py.url('/database/')}" + name;
+ window.location.href = "${py.url('/openerp/database/')}" + name;
}
var on_create = function() {
=== modified file 'addons/openerp/controllers/templates/error_page.mako'
--- addons/openerp/controllers/templates/error_page.mako 2010-02-08 11:51:41 +0000
+++ addons/openerp/controllers/templates/error_page.mako 2010-05-13 10:19:23 +0000
@@ -15,7 +15,7 @@
tb: openobject.dom.get('error').value
}
- var req = openobject.http.postJSON('/errorpage/submit', args);
+ var req = openobject.http.postJSON('/openerp/errorpage/submit', args);
req.addCallback(function(obj){
=== modified file 'addons/openerp/controllers/templates/exp.mako'
--- addons/openerp/controllers/templates/exp.mako 2010-01-12 04:35:09 +0000
+++ addons/openerp/controllers/templates/exp.mako 2010-05-13 10:19:23 +0000
@@ -65,7 +65,7 @@
function save_export() {
var form = document.forms['view_form'];
- form.action = openobject.http.getURL('/impex/save_exp');
+ form.action = openobject.http.getURL('/openerp/impex/save_exp');
var options = openobject.dom.get('fields').options;
forEach(options, function(o){
@@ -93,7 +93,7 @@
model = openobject.dom.get('_terp_model').value;
params = {'_terp_id': id, '_terp_model': model}
- req = openobject.http.postJSON('/impex/get_namelist', params);
+ req = openobject.http.postJSON('/openerp/impex/get_namelist', params);
req.addCallback(function(obj){
if (obj.error){
@@ -118,7 +118,7 @@
params = {'_terp_id' : id};
- setNodeAttribute(form, 'action', openobject.http.getURL('/impex/delete_listname', params));
+ setNodeAttribute(form, 'action', openobject.http.getURL('/openerp/impex/delete_listname', params));
form.submit();
}
@@ -149,14 +149,14 @@
openobject.dom.get('_terp_fields2').value = '[' + fields2.join(',') + ']';
- setNodeAttribute(form, 'action', openobject.http.getURL('/impex/export_data/data.' + openobject.dom.get('export_as').value));
+ setNodeAttribute(form, 'action', openobject.http.getURL('/openerp/impex/export_data/data.' + openobject.dom.get('export_as').value));
form.submit();
}
</script>
</%def>
<%def name="content()">
- <form id='view_form' action="/impex/export_data" method="post" onsubmit="return false;">
+ <form id='view_form' action="/openerp/impex/export_data" method="post" onsubmit="return false;">
<input type="hidden" id="_terp_model" name="_terp_model" value="${model}"/>
<input type="hidden" id="_terp_ids" name="_terp_ids" value="${ids}"/>
=== modified file 'addons/openerp/controllers/templates/fieldpref.mako'
--- addons/openerp/controllers/templates/fieldpref.mako 2010-01-12 04:35:09 +0000
+++ addons/openerp/controllers/templates/fieldpref.mako 2010-05-13 10:19:23 +0000
@@ -12,7 +12,7 @@
</%def>
<%def name="content()">
-<form action="/fieldpref/save" method="post">
+<form action="/openerp/fieldpref/save" method="post">
<input id="_terp_model" name="_terp_model" value="${model}" type="hidden"/>
<input id="_terp_model" name="_terp_field/name" value="${field['name']}" type="hidden"/>
=== modified file 'addons/openerp/controllers/templates/form.mako'
--- addons/openerp/controllers/templates/form.mako 2010-05-06 13:53:38 +0000
+++ addons/openerp/controllers/templates/form.mako 2010-05-13 10:19:23 +0000
@@ -30,7 +30,7 @@
<td>
% if can_shortcut:
% if rpc.session.active_id not in shortcut_ids:
- <a href="${py.url('/shortcuts/add', id=rpc.session.active_id)}" id="menu_header" title="Add as shortcut">
+ <a href="${py.url('/openerp/shortcuts/add', id=rpc.session.active_id)}" id="menu_header" title="Add as shortcut">
<img src="/openerp/static/images/add_shortcut.png" style="padding: 1px;" border="0" width="18px" height="18px"/>
</a>
% else:
@@ -77,7 +77,7 @@
class="button" width="16" height="16"
title="${_('Show attachments.')}"
src="/openerp/static/images/stock/gtk-paste.png"
- onclick="window.open(openobject.http.getURL('/attachment', {model: '${form.screen.model}', id: ${form.screen.id}}))"/>
+ onclick="window.open(openobject.http.getURL('/openerp/attachment', {model: '${form.screen.model}', id: ${form.screen.id}}))"/>
</td>
% endif
% if buttons.can_attach and buttons.has_attach:
@@ -85,7 +85,7 @@
<img
class="button" width="16" height="16"
title="${_('Show attachments.')}"
- src="/openerp/static/images/stock/gtk-paste-v.png" onclick="window.open(openobject.http.getURL('/attachment', {model: '${form.screen.model}', id: '${form.screen.id}'}))"/>
+ src="/openerp/static/images/stock/gtk-paste-v.png" onclick="window.open(openobject.http.getURL('/openerp/attachment', {model: '${form.screen.model}', id: '${form.screen.id}'}))"/>
</td>
% endif
% if form.screen.view_type in ('form'):
@@ -93,7 +93,7 @@
<img
class="button" width="16" height="16"
title="${_('Translate this resource.')}"
- src="/openerp/static/images/stock/stock_translate.png" onclick="openobject.tools.openWindow('${py.url('/translator', _terp_model=form.screen.model, _terp_id=form.screen.id)}')"/>
+ src="/openerp/static/images/stock/stock_translate.png" onclick="openobject.tools.openWindow('${py.url('/openerp/translator', _terp_model=form.screen.model, _terp_id=form.screen.id)}')"/>
</td>
% endif
% if form.screen.view_type in ('form'):
@@ -102,7 +102,7 @@
class="button" width="16" height="16"
title="${_('View Log.')}"
src="/openerp/static/images/stock/stock_log.png"
- onclick="openobject.tools.openWindow('${py.url('/viewlog', _terp_model=form.screen.model, _terp_id=form.screen.id)}', {width: 500, height: 300})"/>
+ onclick="openobject.tools.openWindow('${py.url('/openerp/viewlog', _terp_model=form.screen.model, _terp_id=form.screen.id)}', {width: 500, height: 300})"/>
</td>
% endif
</tr>
@@ -179,13 +179,13 @@
<div id="customise_menu_" class="contextmenu" style="position: absolute; display: none;"
onmouseover="showElement(this);" onmouseout="hideElement(this);">
<a title="${_('Manage views of the current object')}"
- onclick="openobject.tools.openWindow('/viewlist?model=${form.screen.model}', {height: 400})"
+ onclick="openobject.tools.openWindow('/openerp/viewlist?model=${form.screen.model}', {height: 400})"
href="javascript: void(0)">${_("Manage Views")}</a>
<a title="${_('Manage workflows of the current object')}"
onclick="javascript: show_wkf()"
href="javascript: void(0)">${_("Show Workflow")}</a>
<a title="${_('Customise current object or create a new object')}"
- onclick="openobject.tools.openWindow('/viewed/new_model/edit?model=${form.screen.model}')"
+ onclick="openobject.tools.openWindow('/openerp/viewed/new_model/edit?model=${form.screen.model}')"
href="javascript: void(0)">${_("Customise Object")}</a>
</div>
</td>
=== modified file 'addons/openerp/controllers/templates/header.mako'
--- addons/openerp/controllers/templates/header.mako 2010-04-20 11:57:07 +0000
+++ addons/openerp/controllers/templates/header.mako 2010-05-13 10:19:23 +0000
@@ -1,9 +1,9 @@
<%
# put in try block to prevent improper redirection on connection refuse error
try:
- ROOT = cp.request.pool.get_controller("/")
- SHORTCUTS = cp.request.pool.get_controller("/shortcuts")
- REQUESTS = cp.request.pool.get_controller("/requests")
+ ROOT = cp.request.pool.get_controller("/openerp")
+ SHORTCUTS = cp.request.pool.get_controller("/openerp/shortcuts")
+ REQUESTS = cp.request.pool.get_controller("/openerp/requests")
shortcuts = SHORTCUTS.my()
requests, requests_message = REQUESTS.my()
@@ -34,7 +34,7 @@
${_("Welcome %(user)s", user=rpc.session.user_name or 'guest')}
</td>
<td class="menu_connection_links" nowrap="norwap">
- <a href="${py.url('/logout')}" target="_top">${_("Logout")}</a>
+ <a href="${py.url('/openerp/logout')}" target="_top">${_("Logout")}</a>
</td>
</tr>
</table>
@@ -45,7 +45,7 @@
<table border="0" cellpadding="0" cellspacing="0">
<tr>
<td nowrap="nowrap">
- <a target='appFrame' href="${py.url('/home')}">
+ <a target='appFrame' href="${py.url('/openerp/home')}">
<img src="/openerp/static/images/stock/gtk-home.png" style="padding: 4px;" title="Home"
border="0" width="16" height="16" alt="Home"/>
</a>
@@ -62,7 +62,7 @@
</a>
<script type="text/javascript">
jQuery('#show_shortcut').mouseover(function() {
- jQuery.post('/shortcuts/get_shortcuts',
+ jQuery.post('/openerp/shortcuts/get_shortcuts',
function(xmlHttp) {
jQuery('[id=shortcuts_submenu]').html(xmlHttp);
}
@@ -73,7 +73,7 @@
<div class="submenu" id="shortcuts_submenu">
% for sc in shortcuts:
<a target='appFrame'
- href="${py.url('/tree/open', id=sc['res_id'], model='ir.ui.menu')}"
+ href="${py.url('/openerp/tree/open', id=sc['res_id'], model='ir.ui.menu')}"
style="height: 10px; padding: 0 2px 8px 5px;">
${sc['name']}
</a>
@@ -98,7 +98,7 @@
</a>
</td>
<td nowrap="nowrap">
- <a target='appFrame' href="${py.url('/pref/create')}">
+ <a target='appFrame' href="${py.url('/openerp/pref/create')}">
<img src="/openerp/static/images/preferences.png" style="padding: 4px;" title="Preferences"
border="0" width="16" height="16" alt="Preferences"/>
</a>
@@ -115,7 +115,7 @@
</a>
</td>
<td nowrap="nowrap">
- <a target='appFrame' href="${py.url('/about')}">
+ <a target='appFrame' href="${py.url('/openerp/about')}">
<img src="/openerp/static/images/about.png" style="padding: 4px;" title="About" border="0"
width="18" height="18" alt="About"/>
</a>
=== modified file 'addons/openerp/controllers/templates/image.mako'
--- addons/openerp/controllers/templates/image.mako 2010-01-12 04:35:09 +0000
+++ addons/openerp/controllers/templates/image.mako 2010-05-13 10:19:23 +0000
@@ -5,12 +5,12 @@
<script type="text/javascript">
function do_delete(form, id, field){
- setNodeAttribute(form, 'action', openobject.http.getURL('/image/delete', {id: id}));
+ setNodeAttribute(form, 'action', openobject.http.getURL('/openerp/image/delete', {id: id}));
form.submit();
}
function do_save(form, id){
- setNodeAttribute(form, 'action', openobject.http.getURL('/image/save_as', {id: id}));
+ setNodeAttribute(form, 'action', openobject.http.getURL('/openerp/image/save_as', {id: id}));
form.submit();
}
@@ -40,7 +40,7 @@
</tr>
<tr>
<td>
- <form action="/image/add" method="post" enctype="multipart/form-data">
+ <form action="/openerp/image/add" method="post" enctype="multipart/form-data">
<input type="hidden" name="model" value="${model}"/>
<input type="hidden" name="id" value="${id}"/>
<input type="hidden" name="field" value="${field}"/>
=== modified file 'addons/openerp/controllers/templates/imp.mako'
--- addons/openerp/controllers/templates/imp.mako 2010-01-12 04:35:09 +0000
+++ addons/openerp/controllers/templates/imp.mako 2010-05-13 10:19:23 +0000
@@ -81,7 +81,7 @@
form.target = "detector";
- setNodeAttribute(form, 'action', openobject.http.getURL('/impex/import_data'));
+ setNodeAttribute(form, 'action', openobject.http.getURL('/openerp/impex/import_data'));
form.submit();
}
@@ -116,7 +116,7 @@
form.target = "detector";
- setNodeAttribute(form, 'action',openobject.http.getURL('/impex/detect_data'));
+ setNodeAttribute(form, 'action',openobject.http.getURL('/openerp/impex/detect_data'));
form.submit();
}
@@ -124,7 +124,7 @@
</%def>
<%def name="content()">
-<form action="/impex/import_data" method="post" enctype="multipart/form-data">
+<form action="/openerp/impex/import_data" method="post" enctype="multipart/form-data">
<input type="hidden" id="_terp_source" name="_terp_source" value="${source}"/>
<input type="hidden" id="_terp_model" name="_terp_model" value="${model}"/>
=== modified file 'addons/openerp/controllers/templates/login.mako'
--- addons/openerp/controllers/templates/login.mako 2010-03-03 12:24:36 +0000
+++ addons/openerp/controllers/templates/login.mako 2010-05-13 10:19:23 +0000
@@ -60,7 +60,7 @@
<td></td>
<td align="right">
% if cp.config('dbbutton.visible', 'openobject-web'):
- <button type="button" style="white-space: nowrap" tabindex="-1" onclick="location.href='${py.url('/database')}'">${_("Databases")}</button>
+ <button type="button" style="white-space: nowrap" tabindex="-1" onclick="location.href='${py.url('/openerp/database')}'">${_("Databases")}</button>
% endif
<button type="submit" style="width: 80px; white-space: nowrap">${_("Login")}</button>
</td>
=== modified file 'addons/openerp/controllers/templates/login_ajax.mako'
--- addons/openerp/controllers/templates/login_ajax.mako 2010-01-12 04:35:09 +0000
+++ addons/openerp/controllers/templates/login_ajax.mako 2010-05-13 10:19:23 +0000
@@ -36,7 +36,7 @@
return false;
}
- var req = openobject.http.getJSON('/login', {
+ var req = openobject.http.getJSON('/openerp/login', {
'db': openobject.dom.get('db').value,
'user': user,
'password': password,
@@ -46,7 +46,7 @@
req.addCallback(function(obj){
if (obj.result) {
openobject.dom.get('password').value = '';
- window.open(openobject.dom.get('location').value || '/');
+ window.open(openobject.dom.get('location').value || '/openerp');
MochiKit.Style.hideElement('message');
} else {
MochiKit.Visual.appear('message');
@@ -62,7 +62,7 @@
<%def name="content()">
<div class="view">
- <form onsubmit="return do_login()" action="/" method="post" name="loginform">
+ <form onsubmit="return do_login()" action="/openerp" method="post" name="loginform">
<input type="hidden" id="location" name="location" value="${location}"/>
<input type="hidden" id="db" name="db" value="${db}"/>
=== modified file 'addons/openerp/controllers/templates/menu.mako'
--- addons/openerp/controllers/templates/menu.mako 2010-05-06 05:34:10 +0000
+++ addons/openerp/controllers/templates/menu.mako 2010-05-13 10:19:23 +0000
@@ -55,7 +55,7 @@
});
MochiKit.Signal.connect(nb, 'click', function(nb, tab) {
- window.location.href = openobject.http.getURL("/menu", {active: tab.id});
+ window.location.href = openobject.http.getURL("/openerp/menu", {active: tab.id});
});
</script>
@@ -73,7 +73,7 @@
% if tool.get('action_id'):
<script type="text/javascript">
jQuery("#${tool['id']}").click(function() {
- jQuery('#appFrame').attr("src", openobject.http.getURL('/tree/open', {'model': "ir.ui.menu", 'id': "${tool['action_id']}"}))
+ jQuery('#appFrame').attr("src", openobject.http.getURL('/openerp/tree/open', {'model': "ir.ui.menu", 'id': "${tool['action_id']}"}))
});
</script>
% endif
@@ -94,7 +94,7 @@
<iframe id="appFrame" width="100%"
scrolling="no"
frameborder="0"
- name="appFrame" src="${py.url('/home')}"></iframe>
+ name="appFrame" src="${py.url('/openerp/home')}"></iframe>
% else:
<iframe id="appFrame" width="100%"
scrolling="no"
=== modified file 'addons/openerp/controllers/templates/openm2m.mako'
--- addons/openerp/controllers/templates/openm2m.mako 2010-01-12 04:35:09 +0000
+++ addons/openerp/controllers/templates/openm2m.mako 2010-05-13 10:19:23 +0000
@@ -4,7 +4,7 @@
<title>${form.screen.string} </title>
<script type="text/javascript">
- var form_controller = '/openm2m';
+ var form_controller = '/openerp/openm2m';
</script>
<script type="text/javascript">
=== modified file 'addons/openerp/controllers/templates/openm2o.mako'
--- addons/openerp/controllers/templates/openm2o.mako 2010-01-12 04:35:09 +0000
+++ addons/openerp/controllers/templates/openm2o.mako 2010-05-13 10:19:23 +0000
@@ -4,7 +4,7 @@
<title>${form.screen.string} </title>
<script type="text/javascript">
- var form_controller = '/openm2o';
+ var form_controller = '/openerp/openm2o';
</script>
<script type="text/javascript">
=== modified file 'addons/openerp/controllers/templates/openo2m.mako'
--- addons/openerp/controllers/templates/openo2m.mako 2010-01-12 04:35:09 +0000
+++ addons/openerp/controllers/templates/openo2m.mako 2010-05-13 10:19:23 +0000
@@ -4,7 +4,7 @@
<title>${form.screen.string} </title>
<script type="text/javascript">
- var form_controller = '/openo2m';
+ var form_controller = '/openerp/openo2m';
</script>
<script type="text/javascript">
=== modified file 'addons/openerp/controllers/templates/preferences.mako'
--- addons/openerp/controllers/templates/preferences.mako 2010-05-03 11:09:39 +0000
+++ addons/openerp/controllers/templates/preferences.mako 2010-05-13 10:19:23 +0000
@@ -3,10 +3,10 @@
<%def name="header()">
<title>${params.string}</title>
<script type="text/javascript">
- var form_controller = '/pref';
+ var form_controller = '/openerp/pref';
function clear_cache() {
- window.location.href = "${py.url('/pref/clear_cache')}";
+ window.location.href = "${py.url('/openerp/pref/clear_cache')}";
}
</script>
</%def>
@@ -14,7 +14,7 @@
<%def name="content()">
<div class="view">
- <form name="view_form" id="view_form" action="/pref/ok" method="post">
+ <form name="view_form" id="view_form" action="/openerp/pref/ok" method="post">
<table align="center">
<tr>
<td class="toolbar welcome">${params.string}</td>
@@ -26,7 +26,7 @@
% if environment == 'production':
<button type="button" id="cache_clear" name="cache_clear" onclick="clear_cache()">Clear Cache</button>
% endif
- <button type='button' style="width: 80px" onclick="openobject.http.redirect('/')">${_("Cancel")}</button>
+ <button type='button' style="width: 80px" onclick="openobject.http.redirect('/openerp')">${_("Cancel")}</button>
<button type='button' style="width: 80px" onclick="submit_form('ok')">${_("Save")}</button>
</td>
</table>
=== modified file 'addons/openerp/controllers/templates/save_filter.mako'
--- addons/openerp/controllers/templates/save_filter.mako 2010-05-10 09:24:30 +0000
+++ addons/openerp/controllers/templates/save_filter.mako 2010-05-13 10:19:23 +0000
@@ -16,7 +16,7 @@
</%def>
<%def name="content()">
- <form name="filter_sc" method="POST" action="/search/do_filter_sc">
+ <form name="filter_sc" method="POST" action="/openerp/search/do_filter_sc">
<input type="hidden" id="model" name="model" value="${model}"/>
<input type="hidden" id="domain" name="domain" value="${domain}"/>
<input type="hidden" id="flag" name="flag" value="${flag}"/>
=== modified file 'addons/openerp/controllers/templates/search.mako'
--- addons/openerp/controllers/templates/search.mako 2010-04-13 05:52:20 +0000
+++ addons/openerp/controllers/templates/search.mako 2010-05-13 10:19:23 +0000
@@ -4,7 +4,7 @@
<title>Search ${form.screen.string}</title>
<script type="text/javascript">
- var form_controller = '/search';
+ var form_controller = '/openerp/search';
</script>
<script type="text/javascript">
@@ -53,7 +53,7 @@
}
function do_create(){
- act = openobject.http.getURL('/openm2o/edit', {_terp_model: '${params.model}',
+ act = openobject.http.getURL('/openerp/openm2o/edit', {_terp_model: '${params.model}',
_terp_source: '${params.source}',
_terp_m2o: '${params.source}',
_terp_domain: openobject.dom.get('_terp_domain').value,
@@ -95,7 +95,7 @@
}
function do_create(){
- act = openobject.http.getURL('/openm2m/new', {_terp_model: '${params.model}',
+ act = openobject.http.getURL('/openerp/openm2m/new', {_terp_model: '${params.model}',
_terp_source: '${params.source}',
_terp_m2m: '${params.source}',
_terp_domain: openobject.dom.get('_terp_domain').value,
=== modified file 'addons/openerp/controllers/templates/selection.mako'
--- addons/openerp/controllers/templates/selection.mako 2010-01-12 04:35:09 +0000
+++ addons/openerp/controllers/templates/selection.mako 2010-05-13 10:19:23 +0000
@@ -20,7 +20,7 @@
}
</script>
-<form id="selection" action="/selection/action" onsubmit="return onSubmit()">
+<form id="selection" action="/openerp/selection/action" onsubmit="return onSubmit()">
<input type="hidden" name="_terp_data" value="${data}"/>
=== modified file 'addons/openerp/controllers/templates/translator.mako'
--- addons/openerp/controllers/templates/translator.mako 2010-01-12 04:35:09 +0000
+++ addons/openerp/controllers/templates/translator.mako 2010-05-13 10:19:23 +0000
@@ -7,7 +7,7 @@
</%def>
<%def name="content()">
-<form action="/translator/save" method="post" enctype="multipart/form-data">
+<form action="/openerp/translator/save" method="post" enctype="multipart/form-data">
<input type="hidden" id="_terp_model" name="_terp_model" value="${model}"/>
<input type="hidden" id="_terp_id" name="_terp_id" value="${id}"/>
@@ -31,7 +31,7 @@
<tr>
<td class="label">${_("Add Translation for:")}</td>
<td>
- <select name="translate" onchange="window.location.href=openobject.http.getURL('/translator', {_terp_model: '${model}', _terp_id: '${id}', translate: this.value})">
+ <select name="translate" onchange="window.location.href=openobject.http.getURL('/openerp/translator', {_terp_model: '${model}', _terp_id: '${id}', translate: this.value})">
<option value="fields" ${py.selector(translate=='fields')}>${_("Fields")}</option>
<option value="labels" ${py.selector(translate=='labels')}>${_("Labels")}</option>
<option value="relates" ${py.selector(translate=='relates')}>${_("Relates")}</option>
=== modified file 'addons/openerp/controllers/templates/viewed_new.mako'
--- addons/openerp/controllers/templates/viewed_new.mako 2010-01-12 04:35:09 +0000
+++ addons/openerp/controllers/templates/viewed_new.mako 2010-05-13 10:19:23 +0000
@@ -4,7 +4,7 @@
<title>${form.screen.string}</title>
<script type="text/javascript">
- var form_controller = '/viewed/new_field';
+ var form_controller = '/openerp/viewed/new_field';
</script>
<script type="text/javascript">
=== modified file 'addons/openerp/controllers/templates/viewed_new_model.mako'
--- addons/openerp/controllers/templates/viewed_new_model.mako 2010-01-12 04:35:09 +0000
+++ addons/openerp/controllers/templates/viewed_new_model.mako 2010-05-13 10:19:23 +0000
@@ -4,7 +4,7 @@
<title>${form.screen.string}</title>
<script type="text/javascript">
- var form_controller = '/viewed/new_model';
+ var form_controller = '/openerp/viewed/new_model';
</script>
<script type="text/javascript">
=== modified file 'addons/openerp/controllers/templates/viewed_preview.mako'
--- addons/openerp/controllers/templates/viewed_preview.mako 2010-01-12 04:35:09 +0000
+++ addons/openerp/controllers/templates/viewed_preview.mako 2010-05-13 10:19:23 +0000
@@ -4,7 +4,7 @@
<title>${form.screen.string}</title>
<script type="text/javascript">
- var form_controller = '/viewed/preview';
+ var form_controller = '/openerp/viewed/preview';
</script>
</%def>
=== modified file 'addons/openerp/controllers/templates/viewlist.mako'
--- addons/openerp/controllers/templates/viewlist.mako 2010-01-12 04:35:09 +0000
+++ addons/openerp/controllers/templates/viewlist.mako 2010-05-13 10:19:23 +0000
@@ -49,7 +49,7 @@
return;
}
- var act = openobject.http.getURL('/viewed', {view_id: boxes[0].value});
+ var act = openobject.http.getURL('/openerp/viewed', {view_id: boxes[0].value});
if (window.opener) {
window.opener.setTimeout("openobject.tools.openWindow('" + act + "')", 0);
window.close();
@@ -72,7 +72,7 @@
return;
}
- window.location.href = openobject.http.getURL('/viewlist/delete?model=${model}&id=' + boxes[0].value);
+ window.location.href = openobject.http.getURL('/openerp/viewlist/delete?model=${model}&id=' + boxes[0].value);
}
MochiKit.DOM.addLoadEvent(function(evt){
@@ -151,7 +151,7 @@
</tr>
<tr>
<td>
- <form id="view_form" action="/viewlist/create">
+ <form id="view_form" action="/openerp/viewlist/create">
<input type="hidden" id="model" name="model" value="${model}"/>
<table width="400" align="center" class="fields">
<tr>
=== modified file 'addons/openerp/controllers/translator.py'
--- addons/openerp/controllers/translator.py 2010-03-08 11:44:48 +0000
+++ addons/openerp/controllers/translator.py 2010-05-13 10:19:23 +0000
@@ -43,7 +43,7 @@
class Translator(SecuredController):
- _cp_path = "/translator"
+ _cp_path = "/openerp/translator"
@expose(template="templates/translator.mako")
def index(self, translate='fields', **kw):
=== modified file 'addons/openerp/controllers/tree.py'
--- addons/openerp/controllers/tree.py 2010-04-16 09:48:56 +0000
+++ addons/openerp/controllers/tree.py 2010-05-13 10:19:23 +0000
@@ -55,7 +55,7 @@
}
class Tree(SecuredController):
- _cp_path = "/tree"
+ _cp_path = "/openerp/tree"
@expose(template="templates/tree.mako")
def create(self, params):
@@ -181,7 +181,7 @@
id = item.pop('id')
record = {
'id': id,
- 'action': url('/tree/open', model=model, id=id),
+ 'action': url('/openerp/tree/open', model=model, id=id),
'target': None,
'icon': None,
'children': [],
=== modified file 'addons/openerp/controllers/utils.py'
--- addons/openerp/controllers/utils.py 2010-03-08 11:44:48 +0000
+++ addons/openerp/controllers/utils.py 2010-05-13 10:19:23 +0000
@@ -158,8 +158,8 @@
cherrypy.response.cookie['terp_user'] = user.encode('utf-8')
cherrypy.response.cookie['terp_db']['expires'] = expiration_time;
cherrypy.response.cookie['terp_user']['expires'] = expiration_time;
- cherrypy.response.cookie['terp_db']['path'] = tools.url("/");
- cherrypy.response.cookie['terp_user']['path'] = tools.url("/");
+ cherrypy.response.cookie['terp_db']['path'] = tools.url("/openerp");
+ cherrypy.response.cookie['terp_user']['path'] = tools.url("/openerp");
# User is now logged in, so show the content
clear_login_fields(kw)
=== modified file 'addons/openerp/controllers/view_log.py'
--- addons/openerp/controllers/view_log.py 2010-03-08 13:11:14 +0000
+++ addons/openerp/controllers/view_log.py 2010-05-13 10:19:23 +0000
@@ -34,7 +34,7 @@
class View_Log(SecuredController):
- _cp_path = "/viewlog"
+ _cp_path = "/openerp/viewlog"
fields = [
('id', _('ID')),
=== modified file 'addons/openerp/controllers/viewed.py'
--- addons/openerp/controllers/viewed.py 2010-03-08 11:44:48 +0000
+++ addons/openerp/controllers/viewed.py 2010-05-13 10:19:23 +0000
@@ -40,7 +40,7 @@
class NewField(Form):
- _cp_path = "/viewed/new_field"
+ _cp_path = "/openerp/viewed/new_field"
def create_form(self, params, tg_errors=None):
@@ -80,7 +80,7 @@
class NewModel(Form):
- _cp_path = "/viewed/new_model"
+ _cp_path = "/openerp/viewed/new_model"
@expose(template="templates/viewed_new_model.mako")
def create(self, params, tg_errors=None):
@@ -111,7 +111,7 @@
class Preview(Form):
- _cp_path = "/viewed/preview"
+ _cp_path = "/openerp/viewed/preview"
@expose(template="templates/viewed_preview.mako")
def create(self, params, tg_errors=None):
@@ -222,7 +222,7 @@
class ViewEd(SecuredController):
- _cp_path = "/viewed"
+ _cp_path = "/openerp/viewed"
@expose(template="templates/viewed.mako")
def default(self, view_id):
@@ -248,7 +248,7 @@
{'string' : '', 'name': 'up', 'type' : 'image', 'width': 2},
{'string' : '', 'name': 'down', 'type' : 'image', 'width': 2}]
- tree = widgets.treegrid.TreeGrid('view_tree', model=model, headers=headers, url=url('/viewed/data?view_id='+str(view_id)))
+ tree = widgets.treegrid.TreeGrid('view_tree', model=model, headers=headers, url=url('/openerp/viewed/data?view_id='+str(view_id)))
tree.showheaders = False
tree.onselection = 'onSelect'
tree.onbuttonclick = 'onButtonClick'
=== modified file 'addons/openerp/controllers/viewlist.py'
--- addons/openerp/controllers/viewlist.py 2010-03-08 11:44:48 +0000
+++ addons/openerp/controllers/viewlist.py 2010-05-13 10:19:23 +0000
@@ -35,7 +35,7 @@
class ViewList(SecuredController):
- _cp_path = "/viewlist"
+ _cp_path = "/openerp/viewlist"
@expose(template="templates/viewlist.mako")
def index(self, model):
@@ -59,7 +59,7 @@
priority = kw.get('priority', 16)
if not view_name:
- raise redirect('/viewlist', model=model)
+ raise redirect('/openerp/viewlist', model=model)
proxy = rpc.RPCProxy(model)
fields = proxy.fields_get({}).keys()
@@ -88,7 +88,7 @@
proxy = rpc.RPCProxy('ir.ui.view')
proxy.create(dict(model=model, name=view_name, type=view_type, priority=priority, arch=arch))
- raise redirect('/viewlist', model=model)
+ raise redirect('/openerp/viewlist', model=model)
@expose()
def delete(self, model, id):
@@ -98,6 +98,6 @@
proxy = rpc.RPCProxy('ir.ui.view')
proxy.unlink(id)
- raise redirect('/viewlist', model=model)
+ raise redirect('/openerp/viewlist', model=model)
# vim: ts=4 sts=4 sw=4 si et
=== modified file 'addons/openerp/controllers/wizard.py'
--- addons/openerp/controllers/wizard.py 2010-04-22 05:23:26 +0000
+++ addons/openerp/controllers/wizard.py 2010-05-13 10:19:23 +0000
@@ -39,7 +39,7 @@
class Wizard(SecuredController):
- _cp_path = "/wizard"
+ _cp_path = "/openerp/wizard"
def execute(self, params):
@@ -102,7 +102,7 @@
tw.form.Hidden(name='_terp_state2', default=state),
tw.form.Hidden(name='_terp_wiz_id', default=wiz_id)]
- form = tw.form_view.ViewForm(params, name="view_form", action="/wizard/action")
+ form = tw.form_view.ViewForm(params, name="view_form", action="/openerp/wizard/action")
buttons = []
for x in res.get('state', []):
@@ -141,7 +141,7 @@
elif res['type']=='state':
state = res['state']
- raise redirect('/wizard/end')
+ raise redirect('/openerp/wizard/end')
@expose(template="templates/wizard.mako")
def create(self, params, tg_errors=None):
=== modified file 'addons/openerp/static/javascript/dashboard.js'
--- addons/openerp/static/javascript/dashboard.js 2010-02-09 10:08:09 +0000
+++ addons/openerp/static/javascript/dashboard.js 2010-05-13 10:19:23 +0000
@@ -92,7 +92,7 @@
var args = {src: src_id, dst: dst.id, ref: ref_id};
args['view_id'] = openobject.dom.get('_terp_view_id').value;
- var req = openobject.http.postJSON('/viewed/update_dashboard', args);
+ var req = openobject.http.postJSON('/openerp/viewed/update_dashboard', args);
req.addCallback(function(obj) {
if (obj.error) {
=== modified file 'addons/openerp/static/javascript/form.js'
--- addons/openerp/static/javascript/form.js 2010-05-06 13:53:38 +0000
+++ addons/openerp/static/javascript/form.js 2010-05-13 10:19:23 +0000
@@ -94,7 +94,7 @@
if (kind == 'many2many') {
args['source'] = src;
- return openobject.tools.openWindow(get_form_action('/openm2m/edit', args));
+ return openobject.tools.openWindow(get_form_action('/openerp/openm2m/edit', args));
}
window.location.href = get_form_action(action, args);
@@ -167,7 +167,7 @@
}
}
- req = openobject.http.post('/form/switch_o2m', params);
+ req = openobject.http.post('/openerp/form/switch_o2m', params);
req.addCallback(function(xmlHttp) {
var text = xmlHttp.responseText;
@@ -209,7 +209,7 @@
}
}
id = parseInt(id) || null;
- window.location.href = openobject.http.getURL('/process', {res_model: model, res_id: id})
+ window.location.href = openobject.http.getURL('/workflow/process', {res_model: model, res_id: id})
}
function validate_required(form) {
@@ -524,7 +524,7 @@
params['_terp_value'] = caller.value;
params['id'] = id;
- var req = openobject.http.postJSON(callback ? '/form/on_change' : '/form/change_default_get', params);
+ var req = openobject.http.postJSON(callback ? '/openerp/form/on_change' : '/openerp/form/change_default_get', params);
req.addCallback(function(obj) {
@@ -635,7 +635,7 @@
}
if (value_field.value) {
- var req = openobject.http.getJSON('/search/get_name', {model: relation, id : value_field.value});
+ var req = openobject.http.getJSON('/openerp/search/get_name', {model: relation, id : value_field.value});
req.addCallback(function(obj) {
text_field.value = obj.name;
});
@@ -676,7 +676,7 @@
params['_terp_parent_context'] = parent_context.value;
}
- var req = openobject.http.postJSON('/search/eval_domain_and_context', params);
+ var req = openobject.http.postJSON('/openerp/search/eval_domain_and_context', params);
return req.addCallback(function(obj) {
if (obj.error_field) {
@@ -714,7 +714,7 @@
}
req.addCallback(function(obj) {
- openobject.tools.openWindow(openobject.http.getURL('/search/new', {
+ openobject.tools.openWindow(openobject.http.getURL('/openerp/search/new', {
'model': relation,
'domain': obj.domain,
'context': obj.context,
@@ -876,7 +876,7 @@
args['_terp_model'] = model;
args['_terp_field'] = field;
- var req = openobject.http.postJSON('/fieldpref/get', args);
+ var req = openobject.http.postJSON('/openerp/fieldpref/get', args);
req.addCallback(function(obj) {
var text = obj.text;
@@ -888,7 +888,7 @@
'_terp_deps': obj.deps
};
- openobject.tools.openWindow(openobject.http.getURL('/fieldpref', params), {width: 500, height: 350});
+ openobject.tools.openWindow(openobject.http.getURL('/openerp/fieldpref', params), {width: 500, height: 350});
});
}
@@ -1025,7 +1025,7 @@
}
function submenu_action(action_id, model) {
- window.location.href = openobject.http.getURL("/form/action_submenu", {
+ window.location.href = openobject.http.getURL("/openerp/form/action_submenu", {
_terp_action_id: action_id,
_terp_model: model,
_terp_id: $('_terp_id').value
@@ -1044,5 +1044,5 @@
} else
id = $('_terp_id') && $('_terp_id').value!='False' ? $('_terp_id').value : null;
- openobject.tools.openWindow(openobject.http.getURL('/workflow', {model: $('_terp_model').value, rec_id:id}));
+ openobject.tools.openWindow(openobject.http.getURL('/openerp/workflow', {model: $('_terp_model').value, rec_id:id}));
}
=== modified file 'addons/openerp/static/javascript/listgrid.js'
--- addons/openerp/static/javascript/listgrid.js 2010-05-06 06:24:46 +0000
+++ addons/openerp/static/javascript/listgrid.js 2010-05-13 10:19:23 +0000
@@ -94,7 +94,7 @@
sum_fields.push(jQuery(this).attr('id'))
});
- jQuery.post('/listgrid/count_sum',
+ jQuery.post('/openerp/listgrid/count_sum',
{'model':this.model, 'ids': selected_ids.toSource(), 'sum_fields': sum_fields.toSource()},
function(obj) {
for(i in obj.sum) {
@@ -288,7 +288,7 @@
if(eval(ids).length>0) {
jQuery.post(
- '/listgrid/sort_by_order',
+ '/openerp/listgrid/sort_by_order',
{'model': this.model, 'column': column, 'domain': domain, 'search_domain': search_domain, 'filter_domain': filter_domain, 'order': order},
function(obj) {
if(obj.error) {
@@ -336,7 +336,7 @@
_list_view.dragRow(drag, drop);
} else {
jQuery.post(
- '/listgrid/groupbyDrag',
+ '/openerp/listgrid/groupbyDrag',
{'model': _list_view.model, 'children': children, 'domain': domain},
function () { _list_view.reload(); },
"json");
@@ -352,7 +352,7 @@
var view = jQuery(drag).parent().parent().attr('id').split("_grid")[0];
var _list_view = new ListView(view);
jQuery.post(
- '/listgrid/dragRow',
+ '/openerp/listgrid/dragRow',
{'_terp_model': _list_view.model,
'_terp_ids': _list_view.ids,
'_terp_id': jQuery(drag).attr('record'),
@@ -370,7 +370,7 @@
args['_terp_ids'] = this.ids;
args['_terp_id'] = id;
- var req = openobject.http.postJSON('/listgrid/moveUp', args);
+ var req = openobject.http.postJSON('/openerp/listgrid/moveUp', args);
req.addCallback(function() {
self.reload();
});
@@ -385,7 +385,7 @@
'_terp_id': id
};
- var req = openobject.http.postJSON('/listgrid/moveDown', args);
+ var req = openobject.http.postJSON('/openerp/listgrid/moveDown', args);
req.addCallback(function() {
self.reload();
});
@@ -450,7 +450,7 @@
var prefix = this.name == '_terp_list' ? '' : this.name + '/';
if (btype == "open") {
- return window.open(get_form_action('/form/edit', {
+ return window.open(get_form_action('/openerp/form/edit', {
id: id,
ids: openobject.dom.get(prefix + '_terp_ids').value,
model: openobject.dom.get(prefix + '_terp_model').value,
@@ -474,7 +474,7 @@
var req = eval_domain_context_request({source: this.name, context : context || '{}'});
req.addCallback(function(res) {
params['_terp_context'] = res.context;
- var req = openobject.http.postJSON('/listgrid/button_action', params);
+ var req = openobject.http.postJSON('/openerp/listgrid/button_action', params);
req.addCallback(function(obj) {
if (obj.error) {
return alert(obj.error);
@@ -549,7 +549,7 @@
args['_terp_source'] = this.name;
var self = this;
- var req = openobject.http.postJSON('/listgrid/save', args);
+ var req = openobject.http.postJSON('/openerp/listgrid/save', args);
req.addCallback(function(obj) {
if (obj.error) {
@@ -599,7 +599,7 @@
args['_terp_model'] = this.model;
args['_terp_ids'] = ids;
- var req = openobject.http.postJSON('/listgrid/remove', args);
+ var req = openobject.http.postJSON('/openerp/listgrid/remove', args);
req.addCallback(function(obj) {
if (obj.error) {
@@ -675,7 +675,7 @@
}
}
- var req = openobject.http.postJSON('/listgrid/get', args);
+ var req = openobject.http.postJSON('/openerp/listgrid/get', args);
req.addCallback(function(obj) {
var _terp_id = openobject.dom.get(self.name + '/_terp_id') || openobject.dom.get('_terp_id');
var _terp_ids = openobject.dom.get(self.name + '/_terp_ids') || openobject.dom.get('_terp_ids');
@@ -788,7 +788,7 @@
ids = '[' + ids.join(',') + ']';
- openobject.tools.openWindow(openobject.http.getURL('/impex/exp', {_terp_model: this.model,
+ openobject.tools.openWindow(openobject.http.getURL('/openerp/impex/exp', {_terp_model: this.model,
_terp_source: this.name,
_terp_search_domain: openobject.dom.get('_terp_search_domain').value,
_terp_ids: ids,
@@ -797,7 +797,7 @@
},
importData: function() {
- openobject.tools.openWindow(openobject.http.getURL('/impex/imp', {_terp_model: this.model,
+ openobject.tools.openWindow(openobject.http.getURL('/openerp/impex/imp', {_terp_model: this.model,
_terp_source: this.name,
_terp_view_ids : this.view_ids,
_terp_view_mode : this.view_mode}));
=== modified file 'addons/openerp/static/javascript/m2o.js'
--- addons/openerp/static/javascript/m2o.js 2010-05-03 12:12:25 +0000
+++ addons/openerp/static/javascript/m2o.js 2010-05-13 10:19:23 +0000
@@ -166,7 +166,7 @@
var req = eval_domain_context_request({source: source, domain: domain, context: context});
req.addCallback(function(obj){
- openobject.tools.openWindow(openobject.http.getURL('/openm2o/edit', {_terp_model: model, _terp_id: id,
+ openobject.tools.openWindow(openobject.http.getURL('/openerp/openm2o/edit', {_terp_model: model, _terp_id: id,
_terp_domain: obj.domain, _terp_context: obj.context,
_terp_m2o: source, _terp_editable: editable}));
});
@@ -179,7 +179,7 @@
}
if (this.field.value && ! this.text.value){
- var req = openobject.http.postJSON('/search/get_name', {model: this.relation, id : this.field.value});
+ var req = openobject.http.postJSON('/openerp/search/get_name', {model: this.relation, id : this.field.value});
var text_field = this.text;
req.addCallback(function(obj){
@@ -397,7 +397,7 @@
req.addCallback(function(obj){
text = m2o.field.value ? '' : m2o.text.value;
- var req2 = openobject.http.postJSON('/search/get_matched', {model: m2o.relation, text: text,
+ var req2 = openobject.http.postJSON('/openerp/search/get_matched', {model: m2o.relation, text: text,
_terp_domain: obj.domain,
_terp_context: obj.context});
@@ -462,7 +462,7 @@
element['text'] = val
element['model'] = this.relation
- var d = loadJSONDoc('/search/get_matched' + "?" + queryString(element));
+ var d = loadJSONDoc('/openerp/search/get_matched' + "?" + queryString(element));
d.addCallback(this.displayResults);
return true;
}
=== modified file 'addons/openerp/static/javascript/o2m.js'
--- addons/openerp/static/javascript/o2m.js 2010-04-23 07:19:05 +0000
+++ addons/openerp/static/javascript/o2m.js 2010-05-13 10:19:23 +0000
@@ -113,7 +113,7 @@
_terp_editable: readonly ? 0 : 1});
if (id && id != 'False' && !this.default_get_ctx){
- return openobject.tools.openWindow(openobject.http.getURL('/openo2m/edit', params));
+ return openobject.tools.openWindow(openobject.http.getURL('/openerp/openo2m/edit', params));
}
var req = eval_domain_context_request({source: this.name, context : this.default_get_ctx});
@@ -124,13 +124,13 @@
if (!window.browser.isIE) {
params['_terp_o2m_context'] = res.context;
params['_terp_parent_context'] = this.parent_context;
- return openobject.tools.openWindow(openobject.http.getURL('/openo2m/edit', params));
+ return openobject.tools.openWindow(openobject.http.getURL('/openerp/openo2m/edit', params));
}
openobject.http.setCookie('_terp_o2m_context', res.context || '{}');
openobject.http.setCookie('_terp_parent_context', this.parent_context || '{}');
try {
- return openobject.tools.openWindow(openobject.http.getURL('/openo2m/edit', params));
+ return openobject.tools.openWindow(openobject.http.getURL('/openerp/openo2m/edit', params));
} finally {
openobject.http.delCookie('_terp_o2m_context');
openobject.http.delCookie('_terp_parent_context');
=== modified file 'addons/openerp/static/javascript/search.js'
--- addons/openerp/static/javascript/search.js 2010-04-27 07:19:17 +0000
+++ addons/openerp/static/javascript/search.js 2010-05-13 10:19:23 +0000
@@ -196,7 +196,7 @@
record = serializeJSON(record);
params['record'] = record;
var custom_domain = [];
- var search_req = openobject.http.postJSON('/search/get', params);
+ var search_req = openobject.http.postJSON('/openerp/search/get', params);
search_req.addCallback(function(obj){
if (obj.error) {
forEach(children, function(child){
@@ -336,7 +336,7 @@
}
var final_search_domain = function(custom_domain, all_domains, group_by_ctx) {
- var req = openobject.http.postJSON('/search/eval_domain_filter',
+ var req = openobject.http.postJSON('/openerp/search/eval_domain_filter',
{source: '_terp_list',
model: $('_terp_model').value,
custom_domain: custom_domain,
@@ -353,7 +353,7 @@
if(group_by_ctx!=''){
params['group_by'] = group_by_ctx;
}
- openobject.tools.openWindow(openobject.http.getURL('/search/save_filter', params), {
+ openobject.tools.openWindow(openobject.http.getURL('/openerp/search/save_filter', params), {
width: 400,
height: 250
});
@@ -361,7 +361,7 @@
if (obj.action) { // For manage Filter
action = serializeJSON(obj.action);
- window.location.href = openobject.http.getURL('/search/manage_filter', {action: action});
+ window.location.href = openobject.http.getURL('/openerp/search/manage_filter', {action: action});
}
if (obj.domain) { // For direct search
=== modified file 'addons/openerp/static/javascript/treeview.js'
--- addons/openerp/static/javascript/treeview.js 2010-04-16 09:48:56 +0000
+++ addons/openerp/static/javascript/treeview.js 2010-05-13 10:19:23 +0000
@@ -69,7 +69,7 @@
'_terp_selection': '[' + selection + ']'
};
- setNodeAttribute(form, 'action', openobject.http.getURL('/tree/switch', args));
+ setNodeAttribute(form, 'action', openobject.http.getURL('/openerp/tree/switch', args));
form.method = 'post';
form.submit();
=== modified file 'addons/openerp/static/javascript/viewed.js'
--- addons/openerp/static/javascript/viewed.js 2009-10-22 09:49:28 +0000
+++ addons/openerp/static/javascript/viewed.js 2010-05-13 10:19:23 +0000
@@ -72,7 +72,7 @@
return;
}
- var act = data.localName == 'view' ? '/viewed/remove_view' : '/viewed/save/remove';
+ var act = data.localName == 'view' ? '/openerp/viewed/remove_view' : '/openerp/viewed/save/remove';
var req = openobject.http.postJSON(act, {view_id: data.view_id, xpath_expr: getXPath(selected)});
req.addCallback(function(obj){
@@ -101,7 +101,7 @@
return;
}
- var req = openobject.http.post('/viewed/add', {view_id: data.view_id, xpath_expr: getXPath(selected)});
+ var req = openobject.http.post('/openerp/viewed/add', {view_id: data.view_id, xpath_expr: getXPath(selected)});
req.addCallback(function(xmlHttp){
var el = window.mbox.content;
el.innerHTML = xmlHttp.responseText;
@@ -137,7 +137,7 @@
params[el.name] = el.value;
});
- var act = openobject.dom.get('node').value == 'view' ? '/viewed/create_view' : '/viewed/save/node';
+ var act = openobject.dom.get('node').value == 'view' ? '/openerp/viewed/create_view' : '/openerp/viewed/save/node';
var req = openobject.http.postJSON(act, params);
req.addCallback(function(obj) {
@@ -192,7 +192,7 @@
return;
};
- var req = openobject.http.post('/viewed/edit', {view_id: data.view_id, xpath_expr: getXPath(selected)});
+ var req = openobject.http.post('/openerp/viewed/edit', {view_id: data.view_id, xpath_expr: getXPath(selected)});
req.addCallback(function(xmlHttp){
var el = window.mbox.content;
@@ -249,7 +249,7 @@
}
});
- var req = openobject.http.postJSON('/viewed/save/properties', params);
+ var req = openobject.http.postJSON('/openerp/viewed/save/properties', params);
req.addCallback(function(obj){
if (obj.error){
@@ -291,7 +291,7 @@
xpath_ref: getXPath(refNode)
}
- var req = openobject.http.postJSON('/viewed/save/move', params);
+ var req = openobject.http.postJSON('/openerp/viewed/save/move', params);
req.addCallback(function(obj) {
@@ -350,7 +350,7 @@
xpath_expr: getXPath(selected)
};
- var req = openobject.http.postJSON('/viewed/create_view', params);
+ var req = openobject.http.postJSON('/openerp/viewed/create_view', params);
req.addCallback(function(obj) {
if (obj.error){
@@ -365,7 +365,7 @@
}
var onPreview = function() {
- var act = openobject.http.getURL('/viewed/preview/show', {'model' : openobject.dom.get('view_model').value,
+ var act = openobject.http.getURL('/openerp/viewed/preview/show', {'model' : openobject.dom.get('view_model').value,
'view_id' : openobject.dom.get('view_id').value,
'view_type' : openobject.dom.get('view_type').value});
@@ -377,7 +377,7 @@
}
var onNew = function(model){
- var act = openobject.http.getURL('/viewed/new_field/edit', {'for_model' : model});
+ var act = openobject.http.getURL('/openerp/viewed/new_field/edit', {'for_model' : model});
openobject.tools.openWindow(act, {width: 650, height: 400});
}
=== modified file 'addons/openerp/static/javascript/wizard.js'
--- addons/openerp/static/javascript/wizard.js 2010-01-12 07:31:28 +0000
+++ addons/openerp/static/javascript/wizard.js 2010-05-13 10:19:23 +0000
@@ -44,14 +44,14 @@
function wizardAction(state) {
var form = document.forms['view_form'];
- var act = '/wizard/action';
+ var act = '/openerp/wizard/action';
if (state == 'end'){
- act = '/wizard/end';
+ act = '/openerp/wizard/end';
}
if (state == 'report'){
- act = '/wizard/report';
+ act = '/openerp/wizard/report';
}
if (state != 'end' && !validate_required(form)) {
=== modified file 'addons/openerp/widgets/form/_binary.py'
--- addons/openerp/widgets/form/_binary.py 2010-03-08 11:44:48 +0000
+++ addons/openerp/widgets/form/_binary.py 2010-05-13 10:19:23 +0000
@@ -92,7 +92,7 @@
if 'widget' in attrs:
self.stock = False
self.field = self.name.split('/')[-1]
- self.src = tools.url('/image/get_image', model=self.model, id=self.id, field=self.field)
+ self.src = tools.url('/openerp/image/get_image', model=self.model, id=self.id, field=self.field)
self.height = attrs.get('img_height', attrs.get('height', 160))
self.width = attrs.get('img_width', attrs.get('width', 200))
self.validator = validators.Binary()
@@ -129,7 +129,7 @@
finally:
tmp.close()
- url = tools.url("/image/get_picture", hash=hashkey)
+ url = tools.url("/openerp/image/get_picture", hash=hashkey)
else:
url = tools.url("/static/images/blank.gif")
=== modified file 'addons/openerp/widgets/form/templates/image.mako'
--- addons/openerp/widgets/form/templates/image.mako 2009-11-12 09:32:46 +0000
+++ addons/openerp/widgets/form/templates/image.mako 2010-05-13 10:19:23 +0000
@@ -15,7 +15,7 @@
src="${src}"
width="${width}"
height="${height}"
- onclick="openobject.tools.openWindow(openobject.http.getURL('/image', {model: '${model}', id: ${id}, field : '${field}'}), {width: 500, height: 300});"/>
+ onclick="openobject.tools.openWindow(openobject.http.getURL('/openerp/image', {model: '${model}', id: ${id}, field : '${field}'}), {width: 500, height: 300});"/>
% endif
% if not stock and id and not editable:
=== modified file 'addons/openerp/widgets/form/templates/many2one.mako'
--- addons/openerp/widgets/form/templates/many2one.mako 2010-03-26 10:19:23 +0000
+++ addons/openerp/widgets/form/templates/many2one.mako 2010-05-13 10:19:23 +0000
@@ -55,7 +55,7 @@
% if not editable and link:
% if link=='1':
<span id="${name}" ${py.attrs(kind=kind, value=value)}>
- <a href="${py.url('/form/view', model=relation, id=value)}">${text}</a>
+ <a href="${py.url('/openerp/form/view', model=relation, id=value)}">${text}</a>
</span>
% endif
% if link=='0':
@@ -66,7 +66,7 @@
% if not editable and not link == '0':
<span>
<span id="${name}" ${py.attrs(kind=kind, value=value, relation=relation)}>
- <a href="${py.url('/form/view', model=relation, id=value)}">${text}</a>
+ <a href="${py.url('/openerp/form/view', model=relation, id=value)}">${text}</a>
</span>
</span>
% endif
=== modified file 'addons/openerp/widgets/form/templates/one2many.mako'
--- addons/openerp/widgets/form/templates/one2many.mako 2010-04-30 09:31:54 +0000
+++ addons/openerp/widgets/form/templates/one2many.mako 2010-05-13 10:19:23 +0000
@@ -40,7 +40,7 @@
% if not screen.editable and screen.view_type=='form':
<img class="button" title="${_('Translate me.')}" alt="${_('Translate me.')}"
src="/openerp/static/images/stock/stock_translate.png" width="16" height="16"
- onclick="openobject.tools.openWindow('${py.url('/translator', _terp_model=screen.model, _terp_id=screen.id)}')"/>
+ onclick="openobject.tools.openWindow('${py.url('/openerp/translator', _terp_model=screen.model, _terp_id=screen.id)}')"/>
% endif
</td>
</tr>
=== modified file 'addons/openerp/widgets/listgrid.py'
--- addons/openerp/widgets/listgrid.py 2010-05-10 09:05:26 +0000
+++ addons/openerp/widgets/listgrid.py 2010-05-13 10:19:23 +0000
@@ -429,7 +429,7 @@
m2o_link = int(self.attrs.get('link', 1))
if m2o_link == 1:
- return tools.url('/form/view', model=self.attrs['relation'], id=(self.value or False) and self.value[0])
+ return tools.url('/openerp/form/view', model=self.attrs['relation'], id=(self.value or False) and self.value[0])
else:
return None
=== modified file 'addons/openerp/widgets/search.py'
--- addons/openerp/widgets/search.py 2010-05-11 07:03:33 +0000
+++ addons/openerp/widgets/search.py 2010-05-13 10:19:23 +0000
@@ -91,7 +91,7 @@
super(Filter, self).__init__(**attrs)
flag = True
- if cherrypy.request.path_info == '/tree/open':
+ if cherrypy.request.path_info == '/openerp/tree/open':
flag = False
default_domain = attrs.get('default_domain')
=== modified file 'addons/openerp/widgets/templates/sidebar.mako'
--- addons/openerp/widgets/templates/sidebar.mako 2010-03-16 19:44:54 +0000
+++ addons/openerp/widgets/templates/sidebar.mako 2010-05-13 10:19:23 +0000
@@ -24,7 +24,7 @@
<%def name="sidebox_attach_item(item, model)">
<tr>
<td>
- <a href="${py.url(['/attachment/save_as', item[1]], record=item[0])}">${item[1]}</a>
+ <a href="${py.url(['/openerp/attachment/save_as', item[1]], record=item[0])}">${item[1]}</a>
</td>
</tr>
</%def>
=== modified file 'addons/openerp/widgets/tree_view.py'
--- addons/openerp/widgets/tree_view.py 2010-04-16 08:58:24 +0000
+++ addons/openerp/widgets/tree_view.py 2010-05-13 10:19:23 +0000
@@ -102,7 +102,7 @@
self.tree = treegrid.TreeGrid(name="tree_%s" % (id),
model=self.model,
headers=self.headers,
- url=url("/tree/data"),
+ url=url("/openerp/tree/data"),
ids=ids,
domain=self.domain,
context=self.context,
=== renamed file 'addons/view_calendar/__terp__.py' => 'addons/view_calendar/__openerp__.py'
=== modified file 'addons/view_calendar/controllers/_calendar.py'
--- addons/view_calendar/controllers/_calendar.py 2010-03-08 11:44:48 +0000
+++ addons/view_calendar/controllers/_calendar.py 2010-05-13 10:19:23 +0000
@@ -264,13 +264,13 @@
class CalendarPopup(Form):
- _cp_path = "/calpopup"
+ _cp_path = "/calendar/calpopup"
@expose(template="templates/calpopup.mako")
def create(self, params, tg_errors=None):
params.editable = True
- if params.id and cherrypy.request.path_info == '/calpopup/view':
+ if params.id and cherrypy.request.path_info == '/calendar/calpopup/view':
params.load_counter = 2
form = self.create_form(params, tg_errors)
=== modified file 'addons/view_calendar/controllers/templates/calpopup.mako'
--- addons/view_calendar/controllers/templates/calpopup.mako 2010-02-04 12:16:22 +0000
+++ addons/view_calendar/controllers/templates/calpopup.mako 2010-05-13 10:19:23 +0000
@@ -4,7 +4,7 @@
<title>${form.screen.string}</title>
<script type="text/javascript">
- var form_controller = '/calpopup';
+ var form_controller = '/calendar/calpopup';
</script>
<script type="text/javascript">
@@ -23,7 +23,7 @@
'_terp_context': openobject.dom.get('_terp_context').value
}
- var req = openobject.http.postJSON('/calpopup/get_defaults', params);
+ var req = openobject.http.postJSON('/calendar/calpopup/get_defaults', params);
req.addCallback(function(obj){
forEach(items(obj), function(item){
var k = item[0];
=== modified file 'addons/view_calendar/static/javascript/calendar_utils.js'
--- addons/view_calendar/static/javascript/calendar_utils.js 2009-11-02 06:23:10 +0000
+++ addons/view_calendar/static/javascript/calendar_utils.js 2010-05-13 10:19:23 +0000
@@ -193,7 +193,7 @@
'context': openobject.dom.get('_terp_context').value
}
- var act = openobject.http.getURL('/calpopup/edit', params);
+ var act = openobject.http.getURL('/calendar/calpopup/edit', params);
openobject.tools.openWindow(act);
}
=== renamed file 'addons/view_diagram/__terp__.py' => 'addons/view_diagram/__openerp__.py'
=== modified file 'addons/view_diagram/controllers/process.py'
--- addons/view_diagram/controllers/process.py 2010-04-05 09:33:28 +0000
+++ addons/view_diagram/controllers/process.py 2010-05-13 10:19:23 +0000
@@ -37,7 +37,7 @@
class Process(SecuredController):
- _cp_path = "/process"
+ _cp_path = "/workflow/process"
@expose(template="templates/process.mako")
def default(self, id=False, res_model=None, res_id=False):
=== modified file 'addons/view_diagram/controllers/templates/process.mako'
--- addons/view_diagram/controllers/templates/process.mako 2010-04-05 09:33:28 +0000
+++ addons/view_diagram/controllers/templates/process.mako 2010-05-13 10:19:23 +0000
@@ -23,7 +23,7 @@
var id = parseInt(openobject.dom.get('select_workflow').value) || null;
var res_model = openobject.dom.get('res_model').value || null;
var res_id = parseInt(openobject.dom.get('res_id').value) || null;
- window.location.href = openobject.http.getURL("/process", {id: id, res_model: res_model, res_id: res_id});
+ window.location.href = openobject.http.getURL("/workflow/process", {id: id, res_model: res_model, res_id: res_id});
}
</script>
% endif
@@ -83,7 +83,7 @@
</tr>
<tr>
<td class="dimmed-text">
- [<a target="_blank" href="${py.url('/form/edit', model='process.process', id=id)}">${_("Customize")}</a>]
+ [<a target="_blank" href="${py.url('/openerp/form/edit', model='process.process', id=id)}">${_("Customize")}</a>]
</td>
</tr>
</table>
=== modified file 'addons/view_diagram/controllers/templates/process_open.mako'
--- addons/view_diagram/controllers/templates/process_open.mako 2010-03-26 07:36:34 +0000
+++ addons/view_diagram/controllers/templates/process_open.mako 2010-05-13 10:19:23 +0000
@@ -4,7 +4,7 @@
<title>${form.screen.string}</title>
<script type="text/javascript">
- var form_controller = '/process/resource';
+ var form_controller = '/workflow/process/resource';
</script>
<script type="text/javascript">
=== renamed file 'addons/view_graph/__terp__.py' => 'addons/view_graph/__openerp__.py'
=== modified file 'addons/view_graph/widgets/_graph.py'
--- addons/view_graph/widgets/_graph.py 2010-03-08 11:44:48 +0000
+++ addons/view_graph/widgets/_graph.py 2010-05-13 10:19:23 +0000
@@ -476,14 +476,14 @@
ids = s.split('/')[1]
ids = eval(ids)
dom = [('id', 'in', ids)]
- u = url_plus('/form/find', _terp_view_type='tree', _terp_view_mode="['tree', 'graph']",
+ u = url_plus('/openerp/form/find', _terp_view_type='tree', _terp_view_mode="['tree', 'graph']",
_terp_domain=ustr(dom), _terp_model=self.model, _terp_context=ustr(ctx))
url.append(u)
else:
for dom in domain:
- u = url_plus('/form/find', _terp_view_type='tree', _terp_view_mode="['tree', 'graph']",
+ u = url_plus('/openerp/form/find', _terp_view_type='tree', _terp_view_mode="['tree', 'graph']",
_terp_domain=ustr(dom), _terp_model=self.model, _terp_context=ustr(ctx))
url.append(u)
@@ -614,7 +614,7 @@
url = []
for dom in domain:
- u = url_plus('/form/find', _terp_view_type='tree', _terp_view_mode="['tree', 'graph']",
+ u = url_plus('/openerp/form/find', _terp_view_type='tree', _terp_view_mode="['tree', 'graph']",
_terp_domain=ustr(dom), _terp_model=self.model, _terp_context=ustr(ctx))
url.append(u)
=== renamed file 'addons/widget_ckeditor/__terp__.py' => 'addons/widget_ckeditor/__openerp__.py'
=== renamed file 'addons/widget_wiki/__terp__.py' => 'addons/widget_wiki/__openerp__.py'
=== modified file 'addons/widget_wiki/widgets/wiki.py'
--- addons/widget_wiki/widgets/wiki.py 2010-03-08 11:44:48 +0000
+++ addons/widget_wiki/widgets/wiki.py 2010-05-13 10:19:23 +0000
@@ -94,7 +94,7 @@
id = int(text)
except:
id = 0
- return "[[/form/view?model=%s&id=%d | %s]]" % (model, id, label)
+ return "[[/openerp/form/view?model=%s&id=%d | %s]]" % (model, id, label)
bits = _view.sub(record, text)
return bits
@@ -126,7 +126,7 @@
if len(ids) > 0:
return "<a href='/wiki/getfile?file=%s&id=%d'>%s</a>" % (file, id, file)
else:
- return """<a onclick="openobject.tools.openWindow(openobject.http.getURL('/attachment', {model: 'wiki.wiki', id: %d}),
+ return """<a onclick="openobject.tools.openWindow(openobject.http.getURL('/openerp/attachment', {model: 'wiki.wiki', id: %d}),
{name : 'Wiki Attachments'})">Attach : %s </a>""" % (id, file)
bits = _attach.sub(document, text)
return bits
@@ -142,7 +142,7 @@
if len(ids) > 0:
return "<img src='/wiki/getImage?file=%s&id=%d'/>" % (file, id)
else:
- return """<a onclick="openobject.tools.openWindow(openobject.http.getURL('/attachment', {model: 'wiki.wiki', id: %d}),
+ return """<a onclick="openobject.tools.openWindow(openobject.http.getURL('/openerp/attachment', {model: 'wiki.wiki', id: %d}),
{name : 'Wiki Attachments'})">Attach : %s </a>""" % (id, file)
#"[[/attachment/?model=wiki.wiki&id=%d | Attach:%s]]" % (id, file)
bits = _image.sub(image, text)
@@ -165,7 +165,7 @@
id = int(text)
except:
id = 0
- return "[[/form/edit?model=%s&id=%d | %s]]" % (model, id, label)
+ return "[[/openerp/form/edit?model=%s&id=%d | %s]]" % (model, id, label)
bits = _edit.sub(record, text)
return bits
@@ -180,14 +180,14 @@
link_str = ""
if mids:
if len(link) == 2:
- link_str = "<a href='/form/view?model=wiki.wiki&id=%s'>%s</a>" % (mids[0], link[1])
+ link_str = "<a href='/openerp/form/view?model=wiki.wiki&id=%s'>%s</a>" % (mids[0], link[1])
elif len(link) == 1:
- link_str = "<a href='/form/view?model=wiki.wiki&id=%s'>%s</a>" % (mids[0], link[0])
+ link_str = "<a href='/openerp/form/view?model=wiki.wiki&id=%s'>%s</a>" % (mids[0], link[0])
else:
if len(link) == 2:
link_str = "<a href='%s'>%s</a>" % (link[0], link[1])
elif len(link) == 1:
- link_str = "<a href='/form/edit?model=wiki.wiki&id=False'>%s</a>" % (link[0])
+ link_str = "<a href='/openerp/form/edit?model=wiki.wiki&id=False'>%s</a>" % (link[0])
return link_str
=== modified file 'openobject/addons.py'
--- openobject/addons.py 2010-03-08 11:44:48 +0000
+++ openobject/addons.py 2010-05-13 10:19:23 +0000
@@ -90,7 +90,7 @@
info = {}
mod_path = os.path.join(ADDONS_PATH, module)
- terp_file = os.path.join(ADDONS_PATH, module, '__terp__.py')
+ terp_file = os.path.join(ADDONS_PATH, module, '__openerp__.py')
if not mod_path or not terp_file:
return info
@@ -201,7 +201,7 @@
def get_module_list():
addons = [f for f in os.listdir(ADDONS_PATH) \
- if os.path.isfile(os.path.join(ADDONS_PATH, f, "__terp__.py"))]
+ if os.path.isfile(os.path.join(ADDONS_PATH, f, "__openerp__.py"))]
return addons
@@ -211,7 +211,7 @@
return True
addons = [f for f in os.listdir(ADDONS_PATH) \
- if os.path.isfile(os.path.join(ADDONS_PATH, f, "__terp__.py"))]
+ if os.path.isfile(os.path.join(ADDONS_PATH, f, "__openerp__.py"))]
base_addons = [m for m in addons if get_info(m).get("active")]
=== modified file 'openobject/admin/i18n/_commands.py'
--- openobject/admin/i18n/_commands.py 2010-03-08 11:44:48 +0000
+++ openobject/admin/i18n/_commands.py 2010-05-13 10:19:23 +0000
@@ -50,7 +50,7 @@
for module in modules:
d = os.path.join(ADDONS_PATH, module)
- if os.path.isfile(os.path.join(d, '__terp__.py')):
+ if os.path.isfile(os.path.join(d, '__openerp__.py')):
yield module, os.path.join(d, 'locales')
=== modified file 'openobject/controllers/_base.py'
--- openobject/controllers/_base.py 2010-03-08 11:44:48 +0000
+++ openobject/controllers/_base.py 2010-05-13 10:19:23 +0000
@@ -43,7 +43,7 @@
obj = super(ControllerType, cls).__new__(cls, name, bases, attrs)
path = attrs.get("_cp_path")
-
+
if "path" in attrs and name != "BaseController":
raise Exception("Can't override 'path' attribute.")
=== modified file 'openobject/controllers/_root.py'
--- openobject/controllers/_root.py 2010-03-08 11:44:48 +0000
+++ openobject/controllers/_root.py 2010-05-13 10:19:23 +0000
@@ -30,12 +30,11 @@
request = cherrypy.request
path = request.path_info
app = request.app
-
+
pool = request.pool = pooler.get_pool()
names = [x for x in path.strip("/").split("/") if x] + ["index"]
-
- node = pool.get_controller("/")
+ node = pool.get_controller("/openerp")
trail = [["/", node]]
curpath = ""
Follow ups
