Odoo Web Client

Merge lp:~openerp-dev-web/openobject-client-web/cp_path into lp:~openerp-dev/openobject-client-web/trunk-dev-web

  1. cp_path
  2. Merge into trunk-dev-web
Proposed by Vaibhav Darji
Status: Merged
Merged at revision: 3095
Proposed branch: lp:~openerp-dev-web/openobject-client-web/cp_path
Merge into: lp:~openerp-dev/openobject-client-web/trunk-dev-web
Diff against target: 2395 lines (+265/-236) (has conflicts)
85 files modified
addons/openerp/controllers/attachment.py (+1/-1)
addons/openerp/controllers/database.py (+8/-8)
addons/openerp/controllers/error_page.py (+3/-3)
addons/openerp/controllers/fieldpref.py (+1/-1)
addons/openerp/controllers/form.py (+3/-3)
addons/openerp/controllers/image.py (+2/-2)
addons/openerp/controllers/impex.py (+5/-5)
addons/openerp/controllers/listgrid.py (+1/-1)
addons/openerp/controllers/modules.py (+1/-1)
addons/openerp/controllers/openm2m.py (+1/-1)
addons/openerp/controllers/openm2o.py (+1/-1)
addons/openerp/controllers/openo2m.py (+3/-3)
addons/openerp/controllers/preferences.py (+3/-3)
addons/openerp/controllers/requests.py (+1/-1)
addons/openerp/controllers/root.py (+8/-8)
addons/openerp/controllers/search.py (+1/-1)
addons/openerp/controllers/selection.py (+1/-1)
addons/openerp/controllers/shortcuts.py (+7/-7)
addons/openerp/controllers/templates/closepopup.mako (+2/-2)
addons/openerp/controllers/templates/database.mako (+1/-1)
addons/openerp/controllers/templates/error_page.mako (+1/-1)
addons/openerp/controllers/templates/exp.mako (+5/-5)
addons/openerp/controllers/templates/fieldpref.mako (+1/-1)
addons/openerp/controllers/templates/form.mako (+20/-6)
addons/openerp/controllers/templates/header.mako (+9/-9)
addons/openerp/controllers/templates/image.mako (+3/-3)
addons/openerp/controllers/templates/imp.mako (+3/-3)
addons/openerp/controllers/templates/login.mako (+1/-1)
addons/openerp/controllers/templates/login_ajax.mako (+3/-3)
addons/openerp/controllers/templates/menu.mako (+3/-3)
addons/openerp/controllers/templates/openm2m.mako (+1/-1)
addons/openerp/controllers/templates/openm2o.mako (+1/-1)
addons/openerp/controllers/templates/openo2m.mako (+1/-1)
addons/openerp/controllers/templates/preferences.mako (+4/-4)
addons/openerp/controllers/templates/save_filter.mako (+1/-1)
addons/openerp/controllers/templates/search.mako (+3/-3)
addons/openerp/controllers/templates/selection.mako (+1/-1)
addons/openerp/controllers/templates/translator.mako (+5/-1)
addons/openerp/controllers/templates/viewed_new.mako (+1/-1)
addons/openerp/controllers/templates/viewed_new_model.mako (+1/-1)
addons/openerp/controllers/templates/viewed_preview.mako (+1/-1)
addons/openerp/controllers/templates/viewlist.mako (+3/-3)
addons/openerp/controllers/translator.py (+1/-1)
addons/openerp/controllers/tree.py (+2/-2)
addons/openerp/controllers/utils.py (+2/-2)
addons/openerp/controllers/view_log.py (+1/-1)
addons/openerp/controllers/viewed.py (+5/-5)
addons/openerp/controllers/viewlist.py (+4/-4)
addons/openerp/controllers/wizard.py (+3/-3)
addons/openerp/static/javascript/dashboard.js (+1/-1)
addons/openerp/static/javascript/form.js (+11/-11)
addons/openerp/static/javascript/listgrid.js (+24/-12)
addons/openerp/static/javascript/m2o.js (+4/-4)
addons/openerp/static/javascript/o2m.js (+3/-3)
addons/openerp/static/javascript/search.js (+4/-4)
addons/openerp/static/javascript/treeview.js (+1/-1)
addons/openerp/static/javascript/viewed.js (+9/-9)
addons/openerp/static/javascript/wizard.js (+3/-3)
addons/openerp/widgets/form/_binary.py (+2/-2)
addons/openerp/widgets/form/templates/image.mako (+1/-1)
addons/openerp/widgets/form/templates/many2one.mako (+2/-2)
addons/openerp/widgets/form/templates/one2many.mako (+1/-1)
addons/openerp/widgets/listgrid.py (+1/-1)
addons/openerp/widgets/search.py (+1/-1)
addons/openerp/widgets/templates/sidebar.mako (+1/-1)
addons/openerp/widgets/tree_view.py (+1/-1)
addons/view_calendar/controllers/_calendar.py (+3/-3)
addons/view_calendar/controllers/templates/calpopup.mako (+2/-2)
addons/view_calendar/static/javascript/calendar_box.js (+1/-1)
addons/view_calendar/static/javascript/calendar_gantt.js (+1/-1)
addons/view_calendar/static/javascript/calendar_utils.js (+4/-4)
addons/view_calendar/widgets/templates/mini.mako (+2/-2)
addons/view_diagram/controllers/_diagram.py (+3/-3)
addons/view_diagram/controllers/process.py (+1/-1)
addons/view_diagram/controllers/templates/process.mako (+2/-2)
addons/view_diagram/controllers/templates/process_open.mako (+1/-1)
addons/view_diagram/static/javascript/connector.js (+3/-3)
addons/view_diagram/static/javascript/process.js (+5/-5)
addons/view_diagram/static/javascript/state.js (+1/-1)
addons/view_diagram/static/javascript/workflow.js (+6/-6)
addons/view_graph/widgets/_graph.py (+3/-3)
addons/widget_wiki/controllers/wiki.py (+1/-1)
addons/widget_wiki/widgets/wiki.py (+9/-9)
openobject/controllers/_base.py (+1/-1)
openobject/controllers/_root.py (+2/-3)
Text conflict in addons/openerp/controllers/templates/form.mako
Text conflict in addons/openerp/controllers/templates/translator.mako
Text conflict in addons/openerp/static/javascript/listgrid.js
To merge this branch: bzr merge lp:~openerp-dev-web/openobject-client-web/cp_path
Reviewer Review Type Date Requested Status
Antony Lesuisse (OpenERP) Approve
Xavier (Open ERP) (community) Approve
Review via email: mp+25214@code.launchpad.net

Commit message

Changes for _cp_path per addons.
Changes in Ajax Request path.

To post a comment you must log in.
Revision history for this message
Vaibhav Darji (vaibhav-openerp) wrote :

Changes for _cp_path per addons.
Changes in Ajax Request path.

lp:~openerp-dev-web/openobject-client-web/cp_path updated
3082. By Vaibhav Darji

[IMP] _cp_path per addons.

Revision history for this message
Xavier (Open ERP) (xmo-deactivatedaccount) wrote :

If you believe you've got most of them right, I have no issue with merging that. Though maybe merge at the start of next week (after current branch sprint is merged into trunk) instead if you're not completely sure? So there are 2 weeks to ensure that nothing was missed?

noz, your thoughts?

review: Approve
Revision history for this message
Navrang Oza (noz-tiny) wrote :

I think, we should ask AL once, that he wants exactly the same or something else ?
vda tried to follow same but its good to confirm once before merging.

Revision history for this message
Xavier (Open ERP) (xmo-deactivatedaccount) wrote :

OK, I added him to ask for review.

Revision history for this message
Antony Lesuisse (OpenERP) (al-openerp) wrote :

cp_path and url changes seems ok.

But i'm not sure about the templates:

- @expose(template="templates/form.mako")
+ @expose(template="/openerp/controllers/templates/form.mako")

Why is it needed ? I suppose that if a new addons extend a controller (thus in a new directory) the absolute path of the template is needed to find the template from that new addons directory ? Am i right ?

also cleanup conflicts (patch line 760, 1171)

Revision history for this message
Navrang Oza (noz-tiny) wrote :

> cp_path and url changes seems ok.
>
> But i'm not sure about the templates:
>
> - @expose(template="templates/form.mako")
> + @expose(template="/openerp/controllers/templates/form.mako")
>
> Why is it needed ? I suppose that if a new addons extend a controller (thus in
> a new directory) the absolute path of the template is needed to find the
> template from that new addons directory ? Am i right ?
>
>
> also cleanup conflicts (patch line 760, 1171)

Yes Antony,
You are right. There is no need to have path like this.
Thanks for review and comment.

Revision history for this message
Antony Lesuisse (OpenERP) (al-openerp) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'addons/openerp/controllers/attachment.py'
2--- addons/openerp/controllers/attachment.py 2010-03-08 11:44:48 +0000
3+++ addons/openerp/controllers/attachment.py 2010-05-18 12:04:29 +0000
4@@ -36,7 +36,7 @@
5
6 class Attachment(SecuredController):
7
8- _cp_path = "/attachment"
9+ _cp_path = "/openerp/attachment"
10
11 @expose()
12 def index(self, model, id):
13
14=== modified file 'addons/openerp/controllers/database.py'
15--- addons/openerp/controllers/database.py 2010-03-29 05:47:49 +0000
16+++ addons/openerp/controllers/database.py 2010-05-18 12:04:29 +0000
17@@ -129,11 +129,11 @@
18
19 class Database(BaseController):
20
21- _cp_path = "/database"
22+ _cp_path = "/openerp/database"
23
24 @expose()
25 def index(self, *args, **kw):
26- raise redirect('/database/create')
27+ raise redirect('/openerp/database/create')
28
29 @expose(template="templates/database.mako")
30 def create(self, tg_errors=None, **kw):
31@@ -176,8 +176,8 @@
32 raise common.warning(_("Could not create database."))
33
34 if ok:
35- raise redirect('/menu', {'db': True})
36- raise redirect('/login', db=dbname)
37+ raise redirect('/openerp/menu', {'db': True})
38+ raise redirect('/openerp/login', db=dbname)
39
40 @expose(template="templates/database.mako")
41 def drop(self, tg_errors=None, **kw):
42@@ -196,7 +196,7 @@
43 else:
44 raise common.warning(_("Couldn't drop database"))
45
46- raise redirect("/database/drop")
47+ raise redirect("/openerp/database/drop")
48
49 @expose(template="templates/database.mako")
50 def backup(self, tg_errors=None, **kw):
51@@ -216,7 +216,7 @@
52 except Exception, e:
53 raise common.warning(_("Could not create backup."))
54
55- raise redirect('/login')
56+ raise redirect('/openerp/login')
57
58 @expose(template="templates/database.mako")
59 def restore(self, tg_errors=None, **kw):
60@@ -236,7 +236,7 @@
61 else:
62 raise common.warning(_("Couldn't restore database"))
63
64- raise redirect('/login', db=dbname)
65+ raise redirect('/openerp/login', db=dbname)
66
67 @expose(template="templates/database.mako")
68 def password(self, tg_errors=None, **kw):
69@@ -255,7 +255,7 @@
70 else:
71 raise common.warning(_("Error, password not changed."))
72
73- raise redirect('/login')
74+ raise redirect('/openerp/login')
75
76 # vim: ts=4 sts=4 sw=4 si et
77
78
79=== modified file 'addons/openerp/controllers/error_page.py'
80--- addons/openerp/controllers/error_page.py 2010-03-08 11:44:48 +0000
81+++ addons/openerp/controllers/error_page.py 2010-05-18 12:04:29 +0000
82@@ -38,13 +38,13 @@
83
84 class ErrorPage(BaseController):
85
86- _cp_path = "/errorpage"
87+ _cp_path = "/openerp/errorpage"
88
89 nb = widgets.form.Notebook()
90
91 @expose()
92 def index(self, *args, **kw):
93- raise redirect('/')
94+ raise redirect('/openerp')
95
96 def render(self):
97 etype, value, tb = sys.exc_info()
98@@ -68,7 +68,7 @@
99 title=value.title
100 error=value.message
101
102- target = cherrypy.request.path_info or '/form/save'
103+ target = cherrypy.request.path_info or '/openerp/form/save'
104
105 if isinstance(value, common.Concurrency):
106 concurrency = True
107
108=== modified file 'addons/openerp/controllers/fieldpref.py'
109--- addons/openerp/controllers/fieldpref.py 2010-03-08 11:44:48 +0000
110+++ addons/openerp/controllers/fieldpref.py 2010-05-18 12:04:29 +0000
111@@ -33,7 +33,7 @@
112
113 class FieldPref(SecuredController):
114
115- _cp_path = "/fieldpref"
116+ _cp_path = "/openerp/fieldpref"
117
118 @expose(template="templates/fieldpref.mako")
119 def index(self, **kw): #_terp_model, _terp_field, _terp_deps
120
121=== modified file 'addons/openerp/controllers/form.py'
122--- addons/openerp/controllers/form.py 2010-04-27 10:23:57 +0000
123+++ addons/openerp/controllers/form.py 2010-05-18 12:04:29 +0000
124@@ -177,7 +177,7 @@
125
126 class Form(SecuredController):
127
128- _cp_path = "/form"
129+ _cp_path = "/openerp/form"
130
131 def create_form(self, params, tg_errors=None):
132 if tg_errors:
133@@ -188,7 +188,7 @@
134 params.count = params.count or 0
135 params.view_type = params.view_type or params.view_mode[0]
136
137- return tw.form_view.ViewForm(params, name="view_form", action="/form/save")
138+ return tw.form_view.ViewForm(params, name="view_form", action="/openerp/form/save")
139
140 @expose(template="templates/form.mako")
141 def create(self, params, tg_errors=None):
142@@ -1063,7 +1063,7 @@
143 def can_shortcut_create(self):
144 return (rpc.session.is_logged() and
145 rpc.session.active_id and
146- cherrypy.request.path_info == '/tree/open' and
147+ cherrypy.request.path_info == '/openerp/tree/open' and
148 cherrypy.request.params.get('model') == 'ir.ui.menu')
149
150 @expose()
151
152=== modified file 'addons/openerp/controllers/image.py'
153--- addons/openerp/controllers/image.py 2010-03-08 11:44:48 +0000
154+++ addons/openerp/controllers/image.py 2010-05-18 12:04:29 +0000
155@@ -38,7 +38,7 @@
156
157 class Image(SecuredController):
158
159- _cp_path = "/image"
160+ _cp_path = "/openerp/image"
161
162 @expose(template="templates/image.mako")
163 def index(self, **kw):
164@@ -123,7 +123,7 @@
165 res = res.get(field)
166
167 if not res:
168- raise redirect('/image', **kw)
169+ raise redirect('/openerp/image', **kw)
170
171 return base64.decodestring(res)
172
173
174=== modified file 'addons/openerp/controllers/impex.py'
175--- addons/openerp/controllers/impex.py 2010-03-08 11:44:48 +0000
176+++ addons/openerp/controllers/impex.py 2010-05-18 12:04:29 +0000
177@@ -111,7 +111,7 @@
178
179 class ImpEx(SecuredController):
180
181- _cp_path = "/impex"
182+ _cp_path = "/openerp/impex"
183
184 @expose(template="templates/exp.mako")
185 def exp(self, **kw):
186@@ -130,7 +130,7 @@
187 tree = treegrid.TreeGrid('export_fields',
188 model=params.model,
189 headers=headers,
190- url=tools.url('/impex/get_fields'),
191+ url=tools.url('/openerp/impex/get_fields'),
192 field_parent='relation',
193 views=views)
194
195@@ -160,7 +160,7 @@
196 selected_list = [selected_list]
197 proxy.create({'name' : name, 'resource' : params.model, 'export_fields' : [(0, 0, {'name' : f}) for f in selected_list]})
198
199- raise redirect('/impex/exp', **kw)
200+ raise redirect('/openerp/impex/exp', **kw)
201
202 @expose()
203 def delete_listname(self, **kw):
204@@ -170,7 +170,7 @@
205
206 proxy.unlink(params.id)
207
208- raise redirect('/impex/exp', **kw)
209+ raise redirect('/openerp/impex/exp', **kw)
210
211 @expose('json')
212 def get_fields(self, model, prefix='', name='', field_parent=None, **kw):
213@@ -400,7 +400,7 @@
214 tree = treegrid.TreeGrid('import_fields',
215 model=params.model,
216 headers=headers,
217- url=tools.url('/impex/get_fields'),
218+ url=tools.url('/openerp/impex/get_fields'),
219 field_parent='relation',
220 views=views,
221 is_importing=1)
222
223=== modified file 'addons/openerp/controllers/listgrid.py'
224--- addons/openerp/controllers/listgrid.py 2010-05-18 11:44:41 +0000
225+++ addons/openerp/controllers/listgrid.py 2010-05-18 12:04:29 +0000
226@@ -38,7 +38,7 @@
227
228 class List(SecuredController):
229
230- _cp_path = "/listgrid"
231+ _cp_path = "/openerp/listgrid"
232
233 @expose('json')
234 def save(self, **kw):
235
236=== modified file 'addons/openerp/controllers/modules.py'
237--- addons/openerp/controllers/modules.py 2010-03-08 11:44:48 +0000
238+++ addons/openerp/controllers/modules.py 2010-05-18 12:04:29 +0000
239@@ -6,7 +6,7 @@
240
241 class ModuleForm(form.Form):
242
243- _cp_path = "/modules"
244+ _cp_path = "/openerp/modules"
245
246 @expose(template="templates/modules.mako")
247 def create(self, params, tg_errors=None):
248
249=== modified file 'addons/openerp/controllers/openm2m.py'
250--- addons/openerp/controllers/openm2m.py 2010-03-08 11:44:48 +0000
251+++ addons/openerp/controllers/openm2m.py 2010-05-18 12:04:29 +0000
252@@ -36,7 +36,7 @@
253
254 class OpenM2M(Form):
255
256- _cp_path = "/openm2m"
257+ _cp_path = "/openerp/openm2m"
258
259 @expose(template="templates/openm2m.mako")
260 def create(self, params, tg_errors=None):
261
262=== modified file 'addons/openerp/controllers/openm2o.py'
263--- addons/openerp/controllers/openm2o.py 2010-03-08 11:44:48 +0000
264+++ addons/openerp/controllers/openm2o.py 2010-05-18 12:04:29 +0000
265@@ -36,7 +36,7 @@
266
267 class OpenM2O(Form):
268
269- _cp_path = "/openm2o"
270+ _cp_path = "/openerp/openm2o"
271
272 @expose(template="templates/openm2o.mako")
273 def create(self, params, tg_errors=None):
274
275=== modified file 'addons/openerp/controllers/openo2m.py'
276--- addons/openerp/controllers/openo2m.py 2010-04-27 10:23:57 +0000
277+++ addons/openerp/controllers/openo2m.py 2010-05-18 12:04:29 +0000
278@@ -38,7 +38,7 @@
279
280 class OpenO2M(Form):
281
282- _cp_path = "/openo2m"
283+ _cp_path = "/openerp/openo2m"
284
285 def create_form(self, params, tg_errors=None):
286
287@@ -58,7 +58,7 @@
288 # auto increment of sequence
289 vp.id = params.parent_id or False
290
291- form = tw.form_view.ViewForm(vp, name="view_form", action="/openo2m/save")
292+ form = tw.form_view.ViewForm(vp, name="view_form", action="/openerp/openo2m/save")
293 cherrypy.request.terp_validators = {}
294 wid = form.screen.widget.get_widgets_by_name(params.o2m)[0]
295
296@@ -100,7 +100,7 @@
297 tw.form.Hidden(name='_terp_o2m_context', default=ustr(params.o2m_context or {})),
298 tw.form.Hidden(name=params.prefix + '/__id', default=params.id or None)] + hiddens
299
300- form = tw.form_view.ViewForm(params, name="view_form", action="/openo2m/save")
301+ form = tw.form_view.ViewForm(params, name="view_form", action="/openerp/openo2m/save")
302 form.screen.string = wid.screen.string
303
304 return form
305
306=== modified file 'addons/openerp/controllers/preferences.py'
307--- addons/openerp/controllers/preferences.py 2010-05-03 11:09:39 +0000
308+++ addons/openerp/controllers/preferences.py 2010-05-18 12:04:29 +0000
309@@ -36,7 +36,7 @@
310
311 class Preferences(Form):
312
313- _cp_path = "/pref"
314+ _cp_path = "/openerp/pref"
315
316 @expose(template="templates/preferences.mako")
317 def create(self):
318@@ -76,11 +76,11 @@
319 proxy = rpc.RPCProxy('res.users')
320 proxy.write([rpc.session.uid], data)
321 rpc.session.context_reload()
322- raise redirect('/pref/create')
323+ raise redirect('/openerp/pref/create')
324
325 @expose()
326 def clear_cache(self):
327 cache.clear()
328- raise redirect('/blank')
329+ raise redirect('/openerp/blank')
330
331 # vim: ts=4 sts=4 sw=4 si et
332
333=== modified file 'addons/openerp/controllers/requests.py'
334--- addons/openerp/controllers/requests.py 2010-03-08 11:44:48 +0000
335+++ addons/openerp/controllers/requests.py 2010-05-18 12:04:29 +0000
336@@ -35,7 +35,7 @@
337
338 class Requests(SecuredController):
339
340- _cp_path = "/requests"
341+ _cp_path = "/openerp/requests"
342
343 def my(self):
344
345
346=== modified file 'addons/openerp/controllers/root.py'
347--- addons/openerp/controllers/root.py 2010-05-06 06:24:46 +0000
348+++ addons/openerp/controllers/root.py 2010-05-18 12:04:29 +0000
349@@ -35,7 +35,7 @@
350
351 def _cp_on_error():
352
353- errorpage = cherrypy.request.pool.get_controller("/errorpage")
354+ errorpage = cherrypy.request.pool.get_controller("/openerp/errorpage")
355 message = errorpage.render()
356 cherrypy.response.status = 500
357 #cherrypy.response.headers['Content-Type'] = 'text/html'
358@@ -45,13 +45,13 @@
359
360 class Root(SecuredController):
361
362- _cp_path = "/"
363+ _cp_path = "/openerp"
364
365 @expose()
366 def index(self):
367 """Index page, loads the view defined by `action_id`.
368 """
369- raise redirect("/menu")
370+ raise redirect("/openerp/menu")
371
372 def user_action(self, id='action_id'):
373 """Perform default user action.
374@@ -65,7 +65,7 @@
375 if not act_id[0][id]:
376 common.warning(_('You can not log into the system!\nAsk the administrator to verify\nyou have an action defined for your user.'), _('Access Denied!'))
377 rpc.session.logout()
378- raise redirect('/');
379+ raise redirect('/openerp');
380 else:
381 act_id = act_id[0][id][0]
382 from openerp import controllers
383@@ -125,14 +125,14 @@
384
385 tool['tree'] = tree = tree_view.ViewTree(view, 'ir.ui.menu', tid,
386 domain=[('parent_id', '=', tid)],
387- context=ctx, action="/tree/action", fields=fields)
388+ context=ctx, action="/openerp/tree/action", fields=fields)
389 tree._name = "tree_%s" %(tid)
390 tree.tree.onselection = None
391 tree.tree.onheaderclick = None
392 tree.tree.showheaders = 0
393 tree.tree.linktarget = "'appFrame'"
394 if kw.get('db'):
395- return dict(parents=parents, tools=tools, setup = '/home')
396+ return dict(parents=parents, tools=tools, setup = '/openerp/home')
397 return dict(parents=parents, tools=tools)
398
399 @expose(allow_json=True)
400@@ -140,7 +140,7 @@
401 def login(self, db=None, user=None, password=None, style=None, location=None, **kw):
402
403 location = url(location or '/', kw or {})
404-
405+ print "\n\n\n Loacation in login root.py...",location
406 if db and user and user.startswith("anonymous"):
407 if rpc.session.login(db, user, password):
408 raise redirect(location)
409@@ -162,7 +162,7 @@
410 """ Logout method, will terminate the current session.
411 """
412 rpc.session.logout()
413- raise redirect('/')
414+ raise redirect('/openerp')
415
416 @expose(template="templates/about.mako")
417 @unsecured
418
419=== modified file 'addons/openerp/controllers/search.py'
420--- addons/openerp/controllers/search.py 2010-05-10 09:05:26 +0000
421+++ addons/openerp/controllers/search.py 2010-05-18 12:04:29 +0000
422@@ -35,7 +35,7 @@
423
424 class Search(Form):
425
426- _cp_path = "/search"
427+ _cp_path = "/openerp/search"
428
429 @expose(template="templates/search.mako")
430 def create(self, params, tg_errors=None):
431
432=== modified file 'addons/openerp/controllers/selection.py'
433--- addons/openerp/controllers/selection.py 2010-03-08 11:44:48 +0000
434+++ addons/openerp/controllers/selection.py 2010-05-18 12:04:29 +0000
435@@ -34,7 +34,7 @@
436
437 class Selection(SecuredController):
438
439- _cp_path = "/selection"
440+ _cp_path = "/openerp/selection"
441
442 @expose(template="templates/selection.mako")
443 def create(self, values, **data):
444
445=== modified file 'addons/openerp/controllers/shortcuts.py'
446--- addons/openerp/controllers/shortcuts.py 2010-04-20 11:16:15 +0000
447+++ addons/openerp/controllers/shortcuts.py 2010-05-18 12:04:29 +0000
448@@ -35,7 +35,7 @@
449
450 class Shortcuts(SecuredController):
451
452- _cp_path = "/shortcuts"
453+ _cp_path = "/openerp/shortcuts"
454
455 def my(self):
456
457@@ -59,13 +59,13 @@
458 <div id="shortcuts_submenu">
459 % for sc in new_shortcuts:
460 % if type(sc['res_id']) == type(()):
461- <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>
462+ <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>
463 % else:
464- <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>
465+ <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>
466 % endif
467 % endfor
468 <hr id="shortcut_sep" style="border: none; border-top: dashed 1px #CCCCCC; color: #FFFFFF; background-color: #FFFFFF; height: 1px; padding: 0px"/>
469- <a id="manage_shortcuts" target='appFrame' href="/shortcuts" style="height: 10px; padding: 0 2px 8px 5px;">${_("Manage Shortcuts")}</a>
470+ <a id="manage_shortcuts" target='appFrame' href="/openerp/shortcuts" style="height: 10px; padding: 0 2px 8px 5px;">${_("Manage Shortcuts")}</a>
471 </div>
472 """)
473 def get_shortcuts(self):
474@@ -89,9 +89,9 @@
475 for s in sc:
476 if isinstance(s['res_id'], tuple):
477 if s['res_id'][0] == id:
478- raise redirect('/tree/open', id=id, model='ir.ui.menu')
479+ raise redirect('/openerp/tree/open', id=id, model='ir.ui.menu')
480 elif s['res_id'] == id:
481- raise redirect('/tree/open', id=id, model='ir.ui.menu')
482+ raise redirect('/openerp/tree/open', id=id, model='ir.ui.menu')
483
484 name = rpc.RPCProxy('ir.ui.menu').name_get([id], rpc.session.context)[0][1]
485 proxy.create({'user_id': rpc.session.uid, 'res_id': id, 'resource': 'ir.ui.menu', 'name': name})
486@@ -99,6 +99,6 @@
487 sc = proxy.get_sc(rpc.session.uid, 'ir.ui.menu', rpc.session.context)
488 cherrypy.session['terp_shortcuts'] = sc
489
490- raise redirect('/tree/open', id=id, model='ir.ui.menu')
491+ raise redirect('/openerp/tree/open', id=id, model='ir.ui.menu')
492
493 # vim: ts=4 sts=4 sw=4 si et
494
495=== modified file 'addons/openerp/controllers/templates/closepopup.mako'
496--- addons/openerp/controllers/templates/closepopup.mako 2010-04-28 12:11:43 +0000
497+++ addons/openerp/controllers/templates/closepopup.mako 2010-05-18 12:04:29 +0000
498@@ -7,8 +7,8 @@
499 window.opener.location.reload();
500 window.close();
501 } else {
502- openobject.http.redirect('/blank');
503- window.parent.location.href = '/menu';
504+ openobject.http.redirect('/openerp/blank');
505+ window.parent.location.href = '/openerp/menu';
506 }
507 });
508 </script>
509
510=== modified file 'addons/openerp/controllers/templates/database.mako'
511--- addons/openerp/controllers/templates/database.mako 2010-01-28 08:54:33 +0000
512+++ addons/openerp/controllers/templates/database.mako 2010-05-18 12:04:29 +0000
513@@ -17,7 +17,7 @@
514 });
515
516 var dbView = function(name) {
517- window.location.href = "${py.url('/database/')}" + name;
518+ window.location.href = "${py.url('/openerp/database/')}" + name;
519 }
520
521 var on_create = function() {
522
523=== modified file 'addons/openerp/controllers/templates/error_page.mako'
524--- addons/openerp/controllers/templates/error_page.mako 2010-02-08 11:51:41 +0000
525+++ addons/openerp/controllers/templates/error_page.mako 2010-05-18 12:04:29 +0000
526@@ -15,7 +15,7 @@
527 tb: openobject.dom.get('error').value
528 }
529
530- var req = openobject.http.postJSON('/errorpage/submit', args);
531+ var req = openobject.http.postJSON('/openerp/errorpage/submit', args);
532
533 req.addCallback(function(obj){
534
535
536=== modified file 'addons/openerp/controllers/templates/exp.mako'
537--- addons/openerp/controllers/templates/exp.mako 2010-01-12 04:35:09 +0000
538+++ addons/openerp/controllers/templates/exp.mako 2010-05-18 12:04:29 +0000
539@@ -65,7 +65,7 @@
540
541 function save_export() {
542 var form = document.forms['view_form'];
543- form.action = openobject.http.getURL('/impex/save_exp');
544+ form.action = openobject.http.getURL('/openerp/impex/save_exp');
545
546 var options = openobject.dom.get('fields').options;
547 forEach(options, function(o){
548@@ -93,7 +93,7 @@
549 model = openobject.dom.get('_terp_model').value;
550 params = {'_terp_id': id, '_terp_model': model}
551
552- req = openobject.http.postJSON('/impex/get_namelist', params);
553+ req = openobject.http.postJSON('/openerp/impex/get_namelist', params);
554
555 req.addCallback(function(obj){
556 if (obj.error){
557@@ -118,7 +118,7 @@
558
559 params = {'_terp_id' : id};
560
561- setNodeAttribute(form, 'action', openobject.http.getURL('/impex/delete_listname', params));
562+ setNodeAttribute(form, 'action', openobject.http.getURL('/openerp/impex/delete_listname', params));
563 form.submit();
564 }
565
566@@ -149,14 +149,14 @@
567
568 openobject.dom.get('_terp_fields2').value = '[' + fields2.join(',') + ']';
569
570- setNodeAttribute(form, 'action', openobject.http.getURL('/impex/export_data/data.' + openobject.dom.get('export_as').value));
571+ setNodeAttribute(form, 'action', openobject.http.getURL('/openerp/impex/export_data/data.' + openobject.dom.get('export_as').value));
572 form.submit();
573 }
574 </script>
575 </%def>
576
577 <%def name="content()">
578- <form id='view_form' action="/impex/export_data" method="post" onsubmit="return false;">
579+ <form id='view_form' action="/openerp/impex/export_data" method="post" onsubmit="return false;">
580
581 <input type="hidden" id="_terp_model" name="_terp_model" value="${model}"/>
582 <input type="hidden" id="_terp_ids" name="_terp_ids" value="${ids}"/>
583
584=== modified file 'addons/openerp/controllers/templates/fieldpref.mako'
585--- addons/openerp/controllers/templates/fieldpref.mako 2010-01-12 04:35:09 +0000
586+++ addons/openerp/controllers/templates/fieldpref.mako 2010-05-18 12:04:29 +0000
587@@ -12,7 +12,7 @@
588 </%def>
589
590 <%def name="content()">
591-<form action="/fieldpref/save" method="post">
592+<form action="/openerp/fieldpref/save" method="post">
593
594 <input id="_terp_model" name="_terp_model" value="${model}" type="hidden"/>
595 <input id="_terp_model" name="_terp_field/name" value="${field['name']}" type="hidden"/>
596
597=== modified file 'addons/openerp/controllers/templates/form.mako'
598--- addons/openerp/controllers/templates/form.mako 2010-05-14 15:30:48 +0000
599+++ addons/openerp/controllers/templates/form.mako 2010-05-18 12:04:29 +0000
600@@ -38,12 +38,26 @@
601 <table width="100%" class="titlebar">
602 <tr>
603 <td>
604+<<<<<<< TREE
605 % if can_shortcut:
606 <a href="${shortcut_url}" id="menu_header" title="${shortcut_title}">
607 <img src="${shortcut_picture}" alt="${shortcut_title}"
608 style="padding: 1px;" border="0" width="18" height="18"/>
609 </a>
610 % endif
611+=======
612+ % if can_shortcut:
613+ % if rpc.session.active_id not in shortcut_ids:
614+ <a href="${py.url('/openerp/shortcuts/add', id=rpc.session.active_id)}" id="menu_header" title="Add as shortcut">
615+ <img src="/openerp/static/images/add_shortcut.png" style="padding: 1px;" border="0" width="18px" height="18px"/>
616+ </a>
617+ % else:
618+ <a href="javascript: void(0);" id="menu_header" title="Shortcut already added">
619+ <img src="/openerp/static/images/shortcut.png" style="padding: 1px;" border="0" width="18px" height="18px"/>
620+ </a>
621+ % endif
622+ % endif
623+>>>>>>> MERGE-SOURCE
624 </td>
625 <td width="32px" align="center">
626 % if form.screen.view_type in ('tree', 'graph'):
627@@ -84,7 +98,7 @@
628 class="button" width="16" height="16"
629 title="${_('Show attachments.')}"
630 src="/openerp/static/images/stock/gtk-paste.png"
631- onclick="window.open(openobject.http.getURL('/attachment', {model: '${form.screen.model}', id: ${form.screen.id}}))"/>
632+ onclick="window.open(openobject.http.getURL('/openerp/attachment', {model: '${form.screen.model}', id: ${form.screen.id}}))"/>
633 </td>
634 % endif
635 % if buttons.can_attach and buttons.has_attach:
636@@ -92,7 +106,7 @@
637 <img alt="${_('Show attachments.')}"
638 class="button" width="16" height="16"
639 title="${_('Show attachments.')}"
640- src="/openerp/static/images/stock/gtk-paste-v.png" onclick="window.open(openobject.http.getURL('/attachment', {model: '${form.screen.model}', id: '${form.screen.id}'}))"/>
641+ 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}'}))"/>
642 </td>
643 % endif
644 % if form.screen.view_type in ('form'):
645@@ -100,7 +114,7 @@
646 <img alt="${_('Translate this resource.')}"
647 class="button" width="16" height="16"
648 title="${_('Translate this resource.')}"
649- 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)}')"/>
650+ 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)}')"/>
651 </td>
652 % endif
653 % if form.screen.view_type in ('form'):
654@@ -109,7 +123,7 @@
655 class="button" width="16" height="16"
656 title="${_('View Log.')}"
657 src="/openerp/static/images/stock/stock_log.png"
658- onclick="openobject.tools.openWindow('${py.url('/viewlog', _terp_model=form.screen.model, _terp_id=form.screen.id)}', {width: 500, height: 300})"/>
659+ onclick="openobject.tools.openWindow('${py.url('/openerp/viewlog', _terp_model=form.screen.model, _terp_id=form.screen.id)}', {width: 500, height: 300})"/>
660 </td>
661 % endif
662 </tr>
663@@ -186,13 +200,13 @@
664 <div id="customise_menu_" class="contextmenu" style="position: absolute; display: none;"
665 onmouseover="showElement(this);" onmouseout="hideElement(this);">
666 <a title="${_('Manage views of the current object')}"
667- onclick="openobject.tools.openWindow('/viewlist?model=${form.screen.model}', {height: 400})"
668+ onclick="openobject.tools.openWindow('/openerp/viewlist?model=${form.screen.model}', {height: 400})"
669 href="javascript: void(0)">${_("Manage Views")}</a>
670 <a title="${_('Manage workflows of the current object')}"
671 onclick="show_wkf()"
672 href="javascript: void(0)">${_("Show Workflow")}</a>
673 <a title="${_('Customise current object or create a new object')}"
674- onclick="openobject.tools.openWindow('/viewed/new_model/edit?model=${form.screen.model}')"
675+ onclick="openobject.tools.openWindow('/openerp/viewed/new_model/edit?model=${form.screen.model}')"
676 href="javascript: void(0)">${_("Customise Object")}</a>
677 </div>
678 </td>
679
680=== modified file 'addons/openerp/controllers/templates/header.mako'
681--- addons/openerp/controllers/templates/header.mako 2010-04-20 11:57:07 +0000
682+++ addons/openerp/controllers/templates/header.mako 2010-05-18 12:04:29 +0000
683@@ -1,9 +1,9 @@
684 <%
685 # put in try block to prevent improper redirection on connection refuse error
686 try:
687- ROOT = cp.request.pool.get_controller("/")
688- SHORTCUTS = cp.request.pool.get_controller("/shortcuts")
689- REQUESTS = cp.request.pool.get_controller("/requests")
690+ ROOT = cp.request.pool.get_controller("/openerp")
691+ SHORTCUTS = cp.request.pool.get_controller("/openerp/shortcuts")
692+ REQUESTS = cp.request.pool.get_controller("/openerp/requests")
693
694 shortcuts = SHORTCUTS.my()
695 requests, requests_message = REQUESTS.my()
696@@ -34,7 +34,7 @@
697 ${_("Welcome %(user)s", user=rpc.session.user_name or 'guest')}
698 </td>
699 <td class="menu_connection_links" nowrap="norwap">
700- <a href="${py.url('/logout')}" target="_top">${_("Logout")}</a>
701+ <a href="${py.url('/openerp/logout')}" target="_top">${_("Logout")}</a>
702 </td>
703 </tr>
704 </table>
705@@ -45,7 +45,7 @@
706 <table border="0" cellpadding="0" cellspacing="0">
707 <tr>
708 <td nowrap="nowrap">
709- <a target='appFrame' href="${py.url('/home')}">
710+ <a target='appFrame' href="${py.url('/openerp/home')}">
711 <img src="/openerp/static/images/stock/gtk-home.png" style="padding: 4px;" title="Home"
712 border="0" width="16" height="16" alt="Home"/>
713 </a>
714@@ -62,7 +62,7 @@
715 </a>
716 <script type="text/javascript">
717 jQuery('#show_shortcut').mouseover(function() {
718- jQuery.post('/shortcuts/get_shortcuts',
719+ jQuery.post('/openerp/shortcuts/get_shortcuts',
720 function(xmlHttp) {
721 jQuery('[id=shortcuts_submenu]').html(xmlHttp);
722 }
723@@ -73,7 +73,7 @@
724 <div class="submenu" id="shortcuts_submenu">
725 % for sc in shortcuts:
726 <a target='appFrame'
727- href="${py.url('/tree/open', id=sc['res_id'], model='ir.ui.menu')}"
728+ href="${py.url('/openerp/tree/open', id=sc['res_id'], model='ir.ui.menu')}"
729 style="height: 10px; padding: 0 2px 8px 5px;">
730 ${sc['name']}
731 </a>
732@@ -98,7 +98,7 @@
733 </a>
734 </td>
735 <td nowrap="nowrap">
736- <a target='appFrame' href="${py.url('/pref/create')}">
737+ <a target='appFrame' href="${py.url('/openerp/pref/create')}">
738 <img src="/openerp/static/images/preferences.png" style="padding: 4px;" title="Preferences"
739 border="0" width="16" height="16" alt="Preferences"/>
740 </a>
741@@ -115,7 +115,7 @@
742 </a>
743 </td>
744 <td nowrap="nowrap">
745- <a target='appFrame' href="${py.url('/about')}">
746+ <a target='appFrame' href="${py.url('/openerp/about')}">
747 <img src="/openerp/static/images/about.png" style="padding: 4px;" title="About" border="0"
748 width="18" height="18" alt="About"/>
749 </a>
750
751=== modified file 'addons/openerp/controllers/templates/image.mako'
752--- addons/openerp/controllers/templates/image.mako 2010-05-14 14:38:30 +0000
753+++ addons/openerp/controllers/templates/image.mako 2010-05-18 12:04:29 +0000
754@@ -5,12 +5,12 @@
755 <script type="text/javascript">
756
757 function do_delete(form, id, field){
758- setNodeAttribute(form, 'action', openobject.http.getURL('/image/delete', {id: id}));
759+ setNodeAttribute(form, 'action', openobject.http.getURL('/openerp/image/delete', {id: id}));
760 form.submit();
761 }
762
763 function do_save(form, id){
764- setNodeAttribute(form, 'action', openobject.http.getURL('/image/save_as', {id: id}));
765+ setNodeAttribute(form, 'action', openobject.http.getURL('/openerp/image/save_as', {id: id}));
766 form.submit();
767 }
768
769@@ -40,7 +40,7 @@
770 </tr>
771 <tr>
772 <td>
773- <form action="/image/add" method="post" enctype="multipart/form-data">
774+ <form action="/openerp/image/add" method="post" enctype="multipart/form-data">
775 <input type="hidden" name="model" value="${model}"/>
776 <input type="hidden" name="id" value="${id}"/>
777 <input type="hidden" name="field" value="${field}"/>
778
779=== modified file 'addons/openerp/controllers/templates/imp.mako'
780--- addons/openerp/controllers/templates/imp.mako 2010-01-12 04:35:09 +0000
781+++ addons/openerp/controllers/templates/imp.mako 2010-05-18 12:04:29 +0000
782@@ -81,7 +81,7 @@
783
784 form.target = "detector";
785
786- setNodeAttribute(form, 'action', openobject.http.getURL('/impex/import_data'));
787+ setNodeAttribute(form, 'action', openobject.http.getURL('/openerp/impex/import_data'));
788 form.submit();
789 }
790
791@@ -116,7 +116,7 @@
792
793 form.target = "detector";
794
795- setNodeAttribute(form, 'action',openobject.http.getURL('/impex/detect_data'));
796+ setNodeAttribute(form, 'action',openobject.http.getURL('/openerp/impex/detect_data'));
797 form.submit();
798 }
799
800@@ -124,7 +124,7 @@
801 </%def>
802
803 <%def name="content()">
804-<form action="/impex/import_data" method="post" enctype="multipart/form-data">
805+<form action="/openerp/impex/import_data" method="post" enctype="multipart/form-data">
806
807 <input type="hidden" id="_terp_source" name="_terp_source" value="${source}"/>
808 <input type="hidden" id="_terp_model" name="_terp_model" value="${model}"/>
809
810=== modified file 'addons/openerp/controllers/templates/login.mako'
811--- addons/openerp/controllers/templates/login.mako 2010-05-14 14:30:53 +0000
812+++ addons/openerp/controllers/templates/login.mako 2010-05-18 12:04:29 +0000
813@@ -60,7 +60,7 @@
814 <td></td>
815 <td align="right">
816 % if cp.config('dbbutton.visible', 'openobject-web'):
817- <button type="button" style="white-space: nowrap" tabindex="-1" onclick="location.href='${py.url('/database')}'">${_("Databases")}</button>
818+ <button type="button" style="white-space: nowrap" tabindex="-1" onclick="location.href='${py.url('/openerp/database')}'">${_("Databases")}</button>
819 % endif
820 <button type="submit" style="width: 80px; white-space: nowrap">${_("Login")}</button>
821 </td>
822
823=== modified file 'addons/openerp/controllers/templates/login_ajax.mako'
824--- addons/openerp/controllers/templates/login_ajax.mako 2010-05-14 14:30:53 +0000
825+++ addons/openerp/controllers/templates/login_ajax.mako 2010-05-18 12:04:29 +0000
826@@ -36,7 +36,7 @@
827 return false;
828 }
829
830- var req = openobject.http.getJSON('/login', {
831+ var req = openobject.http.getJSON('/openerp/login', {
832 'db': openobject.dom.get('db').value,
833 'user': user,
834 'password': password,
835@@ -46,7 +46,7 @@
836 req.addCallback(function(obj){
837 if (obj.result) {
838 openobject.dom.get('password').value = '';
839- window.open(openobject.dom.get('location').value || '/');
840+ window.open(openobject.dom.get('location').value || '/openerp');
841 MochiKit.Style.hideElement('message');
842 } else {
843 MochiKit.Visual.appear('message');
844@@ -62,7 +62,7 @@
845 <%def name="content()">
846 <div class="view">
847
848- <form onsubmit="return do_login()" action="/" method="post" name="loginform">
849+ <form onsubmit="return do_login()" action="/openerp" method="post" name="loginform">
850 <input type="hidden" id="location" name="location" value="${location}"/>
851 <input type="hidden" id="db" name="db" value="${db}"/>
852
853
854=== modified file 'addons/openerp/controllers/templates/menu.mako'
855--- addons/openerp/controllers/templates/menu.mako 2010-05-06 05:34:10 +0000
856+++ addons/openerp/controllers/templates/menu.mako 2010-05-18 12:04:29 +0000
857@@ -55,7 +55,7 @@
858 });
859
860 MochiKit.Signal.connect(nb, 'click', function(nb, tab) {
861- window.location.href = openobject.http.getURL("/menu", {active: tab.id});
862+ window.location.href = openobject.http.getURL("/openerp/menu", {active: tab.id});
863 });
864
865 </script>
866@@ -73,7 +73,7 @@
867 % if tool.get('action_id'):
868 <script type="text/javascript">
869 jQuery("#${tool['id']}").click(function() {
870- jQuery('#appFrame').attr("src", openobject.http.getURL('/tree/open', {'model': "ir.ui.menu", 'id': "${tool['action_id']}"}))
871+ jQuery('#appFrame').attr("src", openobject.http.getURL('/openerp/tree/open', {'model': "ir.ui.menu", 'id': "${tool['action_id']}"}))
872 });
873 </script>
874 % endif
875@@ -94,7 +94,7 @@
876 <iframe id="appFrame" width="100%"
877 scrolling="no"
878 frameborder="0"
879- name="appFrame" src="${py.url('/home')}"></iframe>
880+ name="appFrame" src="${py.url('/openerp/home')}"></iframe>
881 % else:
882 <iframe id="appFrame" width="100%"
883 scrolling="no"
884
885=== modified file 'addons/openerp/controllers/templates/openm2m.mako'
886--- addons/openerp/controllers/templates/openm2m.mako 2010-05-14 14:38:30 +0000
887+++ addons/openerp/controllers/templates/openm2m.mako 2010-05-18 12:04:29 +0000
888@@ -4,7 +4,7 @@
889 <title>${form.screen.string} </title>
890
891 <script type="text/javascript">
892- var form_controller = '/openm2m';
893+ var form_controller = '/openerp/openm2m';
894 </script>
895
896 <script type="text/javascript">
897
898=== modified file 'addons/openerp/controllers/templates/openm2o.mako'
899--- addons/openerp/controllers/templates/openm2o.mako 2010-05-14 14:38:30 +0000
900+++ addons/openerp/controllers/templates/openm2o.mako 2010-05-18 12:04:29 +0000
901@@ -4,7 +4,7 @@
902 <title>${form.screen.string} </title>
903
904 <script type="text/javascript">
905- var form_controller = '/openm2o';
906+ var form_controller = '/openerp/openm2o';
907 </script>
908
909 <script type="text/javascript">
910
911=== modified file 'addons/openerp/controllers/templates/openo2m.mako'
912--- addons/openerp/controllers/templates/openo2m.mako 2010-05-14 14:38:30 +0000
913+++ addons/openerp/controllers/templates/openo2m.mako 2010-05-18 12:04:29 +0000
914@@ -4,7 +4,7 @@
915 <title>${form.screen.string} </title>
916
917 <script type="text/javascript">
918- var form_controller = '/openo2m';
919+ var form_controller = '/openerp/openo2m';
920 </script>
921
922 <script type="text/javascript">
923
924=== modified file 'addons/openerp/controllers/templates/preferences.mako'
925--- addons/openerp/controllers/templates/preferences.mako 2010-05-03 11:09:39 +0000
926+++ addons/openerp/controllers/templates/preferences.mako 2010-05-18 12:04:29 +0000
927@@ -3,10 +3,10 @@
928 <%def name="header()">
929 <title>${params.string}</title>
930 <script type="text/javascript">
931- var form_controller = '/pref';
932+ var form_controller = '/openerp/pref';
933
934 function clear_cache() {
935- window.location.href = "${py.url('/pref/clear_cache')}";
936+ window.location.href = "${py.url('/openerp/pref/clear_cache')}";
937 }
938 </script>
939 </%def>
940@@ -14,7 +14,7 @@
941 <%def name="content()">
942
943 <div class="view">
944- <form name="view_form" id="view_form" action="/pref/ok" method="post">
945+ <form name="view_form" id="view_form" action="/openerp/pref/ok" method="post">
946 <table align="center">
947 <tr>
948 <td class="toolbar welcome">${params.string}</td>
949@@ -26,7 +26,7 @@
950 % if environment == 'production':
951 <button type="button" id="cache_clear" name="cache_clear" onclick="clear_cache()">Clear Cache</button>
952 % endif
953- <button type='button' style="width: 80px" onclick="openobject.http.redirect('/')">${_("Cancel")}</button>
954+ <button type='button' style="width: 80px" onclick="openobject.http.redirect('/openerp')">${_("Cancel")}</button>
955 <button type='button' style="width: 80px" onclick="submit_form('ok')">${_("Save")}</button>
956 </td>
957 </table>
958
959=== modified file 'addons/openerp/controllers/templates/save_filter.mako'
960--- addons/openerp/controllers/templates/save_filter.mako 2010-05-14 14:38:58 +0000
961+++ addons/openerp/controllers/templates/save_filter.mako 2010-05-18 12:04:29 +0000
962@@ -16,7 +16,7 @@
963 </%def>
964
965 <%def name="content()">
966- <form name="filter_sc" method="POST" action="/search/do_filter_sc">
967+ <form name="filter_sc" method="POST" action="/openerp/search/do_filter_sc">
968 <input type="hidden" id="model" name="model" value="${model}"/>
969 <input type="hidden" id="domain" name="domain" value="${domain}"/>
970 <input type="hidden" id="flag" name="flag" value="${flag}"/>
971
972=== modified file 'addons/openerp/controllers/templates/search.mako'
973--- addons/openerp/controllers/templates/search.mako 2010-05-14 14:38:30 +0000
974+++ addons/openerp/controllers/templates/search.mako 2010-05-18 12:04:29 +0000
975@@ -4,7 +4,7 @@
976 <title>Search ${form.screen.string}</title>
977
978 <script type="text/javascript">
979- var form_controller = '/search';
980+ var form_controller = '/openerp/search';
981 </script>
982
983 <script type="text/javascript">
984@@ -53,7 +53,7 @@
985 }
986
987 function do_create(){
988- act = openobject.http.getURL('/openm2o/edit', {_terp_model: '${params.model}',
989+ act = openobject.http.getURL('/openerp/openm2o/edit', {_terp_model: '${params.model}',
990 _terp_source: '${params.source}',
991 _terp_m2o: '${params.source}',
992 _terp_domain: openobject.dom.get('_terp_domain').value,
993@@ -95,7 +95,7 @@
994 }
995
996 function do_create(){
997- act = openobject.http.getURL('/openm2m/new', {_terp_model: '${params.model}',
998+ act = openobject.http.getURL('/openerp/openm2m/new', {_terp_model: '${params.model}',
999 _terp_source: '${params.source}',
1000 _terp_m2m: '${params.source}',
1001 _terp_domain: openobject.dom.get('_terp_domain').value,
1002
1003=== modified file 'addons/openerp/controllers/templates/selection.mako'
1004--- addons/openerp/controllers/templates/selection.mako 2010-01-12 04:35:09 +0000
1005+++ addons/openerp/controllers/templates/selection.mako 2010-05-18 12:04:29 +0000
1006@@ -20,7 +20,7 @@
1007 }
1008 </script>
1009
1010-<form id="selection" action="/selection/action" onsubmit="return onSubmit()">
1011+<form id="selection" action="/openerp/selection/action" onsubmit="return onSubmit()">
1012
1013 <input type="hidden" name="_terp_data" value="${data}"/>
1014
1015
1016=== modified file 'addons/openerp/controllers/templates/translator.mako'
1017--- addons/openerp/controllers/templates/translator.mako 2010-05-14 14:38:58 +0000
1018+++ addons/openerp/controllers/templates/translator.mako 2010-05-18 12:04:29 +0000
1019@@ -7,7 +7,7 @@
1020 </%def>
1021
1022 <%def name="content()">
1023-<form action="/translator/save" method="post" enctype="multipart/form-data">
1024+<form action="/openerp/translator/save" method="post" enctype="multipart/form-data">
1025 <input type="hidden" id="_terp_model" name="_terp_model" value="${model}"/>
1026 <input type="hidden" id="_terp_id" name="_terp_id" value="${id}"/>
1027
1028@@ -31,7 +31,11 @@
1029 <tr>
1030 <td class="label"><label for="translate">${_("Add Translation for:")}</label></td>
1031 <td>
1032+<<<<<<< TREE
1033 <select name="translate" id="translate" onchange="window.location.href=openobject.http.getURL('/translator', {_terp_model: '${model}', _terp_id: '${id}', translate: this.value})">
1034+=======
1035+ <select name="translate" onchange="window.location.href=openobject.http.getURL('/openerp/translator', {_terp_model: '${model}', _terp_id: '${id}', translate: this.value})">
1036+>>>>>>> MERGE-SOURCE
1037 <option value="fields" ${py.selector(translate=='fields')}>${_("Fields")}</option>
1038 <option value="labels" ${py.selector(translate=='labels')}>${_("Labels")}</option>
1039 <option value="relates" ${py.selector(translate=='relates')}>${_("Relates")}</option>
1040
1041=== modified file 'addons/openerp/controllers/templates/viewed_new.mako'
1042--- addons/openerp/controllers/templates/viewed_new.mako 2010-05-14 14:38:30 +0000
1043+++ addons/openerp/controllers/templates/viewed_new.mako 2010-05-18 12:04:29 +0000
1044@@ -4,7 +4,7 @@
1045 <title>${form.screen.string}</title>
1046
1047 <script type="text/javascript">
1048- var form_controller = '/viewed/new_field';
1049+ var form_controller = '/openerp/viewed/new_field';
1050 </script>
1051
1052 <script type="text/javascript">
1053
1054=== modified file 'addons/openerp/controllers/templates/viewed_new_model.mako'
1055--- addons/openerp/controllers/templates/viewed_new_model.mako 2010-05-14 14:38:30 +0000
1056+++ addons/openerp/controllers/templates/viewed_new_model.mako 2010-05-18 12:04:29 +0000
1057@@ -4,7 +4,7 @@
1058 <title>${form.screen.string}</title>
1059
1060 <script type="text/javascript">
1061- var form_controller = '/viewed/new_model';
1062+ var form_controller = '/openerp/viewed/new_model';
1063 </script>
1064
1065 <script type="text/javascript">
1066
1067=== modified file 'addons/openerp/controllers/templates/viewed_preview.mako'
1068--- addons/openerp/controllers/templates/viewed_preview.mako 2010-05-14 14:38:30 +0000
1069+++ addons/openerp/controllers/templates/viewed_preview.mako 2010-05-18 12:04:29 +0000
1070@@ -4,7 +4,7 @@
1071 <title>${form.screen.string}</title>
1072
1073 <script type="text/javascript">
1074- var form_controller = '/viewed/preview';
1075+ var form_controller = '/openerp/viewed/preview';
1076 </script>
1077 </%def>
1078
1079
1080=== modified file 'addons/openerp/controllers/templates/viewlist.mako'
1081--- addons/openerp/controllers/templates/viewlist.mako 2010-05-14 14:38:58 +0000
1082+++ addons/openerp/controllers/templates/viewlist.mako 2010-05-18 12:04:29 +0000
1083@@ -49,7 +49,7 @@
1084 return;
1085 }
1086
1087- var act = openobject.http.getURL('/viewed', {view_id: boxes[0].value});
1088+ var act = openobject.http.getURL('/openerp/viewed', {view_id: boxes[0].value});
1089 if (window.opener) {
1090 window.opener.setTimeout("openobject.tools.openWindow('" + act + "')", 0);
1091 window.close();
1092@@ -72,7 +72,7 @@
1093 return;
1094 }
1095
1096- window.location.href = openobject.http.getURL('/viewlist/delete?model=${model}&id=' + boxes[0].value);
1097+ window.location.href = openobject.http.getURL('/openerp/viewlist/delete?model=${model}&id=' + boxes[0].value);
1098 }
1099
1100 MochiKit.DOM.addLoadEvent(function(evt){
1101@@ -151,7 +151,7 @@
1102 </tr>
1103 <tr>
1104 <td>
1105- <form id="view_form" action="/viewlist/create">
1106+ <form id="view_form" action="/openerp/viewlist/create">
1107 <input type="hidden" id="model" name="model" value="${model}"/>
1108 <table width="400" align="center" class="fields">
1109 <tr>
1110
1111=== modified file 'addons/openerp/controllers/translator.py'
1112--- addons/openerp/controllers/translator.py 2010-03-08 11:44:48 +0000
1113+++ addons/openerp/controllers/translator.py 2010-05-18 12:04:29 +0000
1114@@ -43,7 +43,7 @@
1115
1116 class Translator(SecuredController):
1117
1118- _cp_path = "/translator"
1119+ _cp_path = "/openerp/translator"
1120
1121 @expose(template="templates/translator.mako")
1122 def index(self, translate='fields', **kw):
1123
1124=== modified file 'addons/openerp/controllers/tree.py'
1125--- addons/openerp/controllers/tree.py 2010-04-16 09:48:56 +0000
1126+++ addons/openerp/controllers/tree.py 2010-05-18 12:04:29 +0000
1127@@ -55,7 +55,7 @@
1128 }
1129
1130 class Tree(SecuredController):
1131- _cp_path = "/tree"
1132+ _cp_path = "/openerp/tree"
1133
1134 @expose(template="templates/tree.mako")
1135 def create(self, params):
1136@@ -181,7 +181,7 @@
1137 id = item.pop('id')
1138 record = {
1139 'id': id,
1140- 'action': url('/tree/open', model=model, id=id),
1141+ 'action': url('/openerp/tree/open', model=model, id=id),
1142 'target': None,
1143 'icon': None,
1144 'children': [],
1145
1146=== modified file 'addons/openerp/controllers/utils.py'
1147--- addons/openerp/controllers/utils.py 2010-03-08 11:44:48 +0000
1148+++ addons/openerp/controllers/utils.py 2010-05-18 12:04:29 +0000
1149@@ -158,8 +158,8 @@
1150 cherrypy.response.cookie['terp_user'] = user.encode('utf-8')
1151 cherrypy.response.cookie['terp_db']['expires'] = expiration_time;
1152 cherrypy.response.cookie['terp_user']['expires'] = expiration_time;
1153- cherrypy.response.cookie['terp_db']['path'] = tools.url("/");
1154- cherrypy.response.cookie['terp_user']['path'] = tools.url("/");
1155+ cherrypy.response.cookie['terp_db']['path'] = tools.url("/openerp");
1156+ cherrypy.response.cookie['terp_user']['path'] = tools.url("/openerp");
1157
1158 # User is now logged in, so show the content
1159 clear_login_fields(kw)
1160
1161=== modified file 'addons/openerp/controllers/view_log.py'
1162--- addons/openerp/controllers/view_log.py 2010-03-08 13:11:14 +0000
1163+++ addons/openerp/controllers/view_log.py 2010-05-18 12:04:29 +0000
1164@@ -34,7 +34,7 @@
1165
1166 class View_Log(SecuredController):
1167
1168- _cp_path = "/viewlog"
1169+ _cp_path = "/openerp/viewlog"
1170
1171 fields = [
1172 ('id', _('ID')),
1173
1174=== modified file 'addons/openerp/controllers/viewed.py'
1175--- addons/openerp/controllers/viewed.py 2010-03-08 11:44:48 +0000
1176+++ addons/openerp/controllers/viewed.py 2010-05-18 12:04:29 +0000
1177@@ -40,7 +40,7 @@
1178
1179 class NewField(Form):
1180
1181- _cp_path = "/viewed/new_field"
1182+ _cp_path = "/openerp/viewed/new_field"
1183
1184 def create_form(self, params, tg_errors=None):
1185
1186@@ -80,7 +80,7 @@
1187
1188 class NewModel(Form):
1189
1190- _cp_path = "/viewed/new_model"
1191+ _cp_path = "/openerp/viewed/new_model"
1192
1193 @expose(template="templates/viewed_new_model.mako")
1194 def create(self, params, tg_errors=None):
1195@@ -111,7 +111,7 @@
1196
1197 class Preview(Form):
1198
1199- _cp_path = "/viewed/preview"
1200+ _cp_path = "/openerp/viewed/preview"
1201
1202 @expose(template="templates/viewed_preview.mako")
1203 def create(self, params, tg_errors=None):
1204@@ -222,7 +222,7 @@
1205
1206 class ViewEd(SecuredController):
1207
1208- _cp_path = "/viewed"
1209+ _cp_path = "/openerp/viewed"
1210
1211 @expose(template="templates/viewed.mako")
1212 def default(self, view_id):
1213@@ -248,7 +248,7 @@
1214 {'string' : '', 'name': 'up', 'type' : 'image', 'width': 2},
1215 {'string' : '', 'name': 'down', 'type' : 'image', 'width': 2}]
1216
1217- tree = widgets.treegrid.TreeGrid('view_tree', model=model, headers=headers, url=url('/viewed/data?view_id='+str(view_id)))
1218+ tree = widgets.treegrid.TreeGrid('view_tree', model=model, headers=headers, url=url('/openerp/viewed/data?view_id='+str(view_id)))
1219 tree.showheaders = False
1220 tree.onselection = 'onSelect'
1221 tree.onbuttonclick = 'onButtonClick'
1222
1223=== modified file 'addons/openerp/controllers/viewlist.py'
1224--- addons/openerp/controllers/viewlist.py 2010-03-08 11:44:48 +0000
1225+++ addons/openerp/controllers/viewlist.py 2010-05-18 12:04:29 +0000
1226@@ -35,7 +35,7 @@
1227
1228 class ViewList(SecuredController):
1229
1230- _cp_path = "/viewlist"
1231+ _cp_path = "/openerp/viewlist"
1232
1233 @expose(template="templates/viewlist.mako")
1234 def index(self, model):
1235@@ -59,7 +59,7 @@
1236 priority = kw.get('priority', 16)
1237
1238 if not view_name:
1239- raise redirect('/viewlist', model=model)
1240+ raise redirect('/openerp/viewlist', model=model)
1241
1242 proxy = rpc.RPCProxy(model)
1243 fields = proxy.fields_get({}).keys()
1244@@ -88,7 +88,7 @@
1245 proxy = rpc.RPCProxy('ir.ui.view')
1246 proxy.create(dict(model=model, name=view_name, type=view_type, priority=priority, arch=arch))
1247
1248- raise redirect('/viewlist', model=model)
1249+ raise redirect('/openerp/viewlist', model=model)
1250
1251 @expose()
1252 def delete(self, model, id):
1253@@ -98,6 +98,6 @@
1254 proxy = rpc.RPCProxy('ir.ui.view')
1255 proxy.unlink(id)
1256
1257- raise redirect('/viewlist', model=model)
1258+ raise redirect('/openerp/viewlist', model=model)
1259
1260 # vim: ts=4 sts=4 sw=4 si et
1261
1262=== modified file 'addons/openerp/controllers/wizard.py'
1263--- addons/openerp/controllers/wizard.py 2010-04-22 05:23:26 +0000
1264+++ addons/openerp/controllers/wizard.py 2010-05-18 12:04:29 +0000
1265@@ -39,7 +39,7 @@
1266
1267 class Wizard(SecuredController):
1268
1269- _cp_path = "/wizard"
1270+ _cp_path = "/openerp/wizard"
1271
1272 def execute(self, params):
1273
1274@@ -102,7 +102,7 @@
1275 tw.form.Hidden(name='_terp_state2', default=state),
1276 tw.form.Hidden(name='_terp_wiz_id', default=wiz_id)]
1277
1278- form = tw.form_view.ViewForm(params, name="view_form", action="/wizard/action")
1279+ form = tw.form_view.ViewForm(params, name="view_form", action="/openerp/wizard/action")
1280
1281 buttons = []
1282 for x in res.get('state', []):
1283@@ -141,7 +141,7 @@
1284 elif res['type']=='state':
1285 state = res['state']
1286
1287- raise redirect('/wizard/end')
1288+ raise redirect('/openerp/wizard/end')
1289
1290 @expose(template="templates/wizard.mako")
1291 def create(self, params, tg_errors=None):
1292
1293=== modified file 'addons/openerp/static/javascript/dashboard.js'
1294--- addons/openerp/static/javascript/dashboard.js 2010-02-09 10:08:09 +0000
1295+++ addons/openerp/static/javascript/dashboard.js 2010-05-18 12:04:29 +0000
1296@@ -92,7 +92,7 @@
1297 var args = {src: src_id, dst: dst.id, ref: ref_id};
1298 args['view_id'] = openobject.dom.get('_terp_view_id').value;
1299
1300- var req = openobject.http.postJSON('/viewed/update_dashboard', args);
1301+ var req = openobject.http.postJSON('/openerp/viewed/update_dashboard', args);
1302 req.addCallback(function(obj) {
1303
1304 if (obj.error) {
1305
1306=== modified file 'addons/openerp/static/javascript/form.js'
1307--- addons/openerp/static/javascript/form.js 2010-05-13 12:20:57 +0000
1308+++ addons/openerp/static/javascript/form.js 2010-05-18 12:04:29 +0000
1309@@ -94,7 +94,7 @@
1310
1311 if (kind == 'many2many') {
1312 args['source'] = src;
1313- return openobject.tools.openWindow(get_form_action('/openm2m/edit', args));
1314+ return openobject.tools.openWindow(get_form_action('/openerp/openm2m/edit', args));
1315 }
1316
1317 window.location.href = get_form_action(action, args);
1318@@ -167,7 +167,7 @@
1319 }
1320 }
1321
1322- req = openobject.http.post('/form/switch_o2m', params);
1323+ req = openobject.http.post('/openerp/form/switch_o2m', params);
1324 req.addCallback(function(xmlHttp) {
1325
1326 var text = xmlHttp.responseText;
1327@@ -209,7 +209,7 @@
1328 }
1329 }
1330 id = parseInt(id) || null;
1331- window.location.href = openobject.http.getURL('/process', {res_model: model, res_id: id})
1332+ window.location.href = openobject.http.getURL('/view_diagram/process', {res_model: model, res_id: id})
1333 }
1334
1335 function validate_required(form) {
1336@@ -513,7 +513,7 @@
1337 params['_terp_value'] = caller.value;
1338 params['id'] = id;
1339
1340- var req = openobject.http.postJSON(callback ? '/form/on_change' : '/form/change_default_get', params);
1341+ var req = openobject.http.postJSON(callback ? '/openerp/form/on_change' : '/openerp/form/change_default_get', params);
1342
1343 req.addCallback(function(obj) {
1344
1345@@ -624,7 +624,7 @@
1346 }
1347
1348 if (value_field.value) {
1349- var req = openobject.http.getJSON('/search/get_name', {model: relation, id : value_field.value});
1350+ var req = openobject.http.getJSON('/openerp/search/get_name', {model: relation, id : value_field.value});
1351 req.addCallback(function(obj) {
1352 text_field.value = obj.name;
1353 });
1354@@ -665,7 +665,7 @@
1355 params['_terp_parent_context'] = parent_context.value;
1356 }
1357
1358- var req = openobject.http.postJSON('/search/eval_domain_and_context', params);
1359+ var req = openobject.http.postJSON('/openerp/search/eval_domain_and_context', params);
1360 return req.addCallback(function(obj) {
1361
1362 if (obj.error_field) {
1363@@ -703,7 +703,7 @@
1364 }
1365
1366 req.addCallback(function(obj) {
1367- openobject.tools.openWindow(openobject.http.getURL('/search/new', {
1368+ openobject.tools.openWindow(openobject.http.getURL('/openerp/search/new', {
1369 'model': relation,
1370 'domain': obj.domain,
1371 'context': obj.context,
1372@@ -865,7 +865,7 @@
1373 args['_terp_model'] = model;
1374 args['_terp_field'] = field;
1375
1376- var req = openobject.http.postJSON('/fieldpref/get', args);
1377+ var req = openobject.http.postJSON('/openerp/fieldpref/get', args);
1378
1379 req.addCallback(function(obj) {
1380 var text = obj.text;
1381@@ -877,7 +877,7 @@
1382 '_terp_deps': obj.deps
1383 };
1384
1385- openobject.tools.openWindow(openobject.http.getURL('/fieldpref', params), {width: 500, height: 350});
1386+ openobject.tools.openWindow(openobject.http.getURL('/openerp/fieldpref', params), {width: 500, height: 350});
1387 });
1388 }
1389
1390@@ -1014,7 +1014,7 @@
1391 }
1392
1393 function submenu_action(action_id, model) {
1394- window.location.href = openobject.http.getURL("/form/action_submenu", {
1395+ window.location.href = openobject.http.getURL("/openerp/form/action_submenu", {
1396 _terp_action_id: action_id,
1397 _terp_model: model,
1398 _terp_id: $('_terp_id').value
1399@@ -1033,5 +1033,5 @@
1400 } else
1401 id = $('_terp_id') && $('_terp_id').value!='False' ? $('_terp_id').value : null;
1402
1403- openobject.tools.openWindow(openobject.http.getURL('/workflow', {model: $('_terp_model').value, rec_id:id}));
1404+ openobject.tools.openWindow(openobject.http.getURL('/view_diagram/workflow', {model: $('_terp_model').value, rec_id:id}));
1405 }
1406
1407=== modified file 'addons/openerp/static/javascript/listgrid.js'
1408--- addons/openerp/static/javascript/listgrid.js 2010-05-18 11:44:41 +0000
1409+++ addons/openerp/static/javascript/listgrid.js 2010-05-18 12:04:29 +0000
1410@@ -94,6 +94,7 @@
1411 sum_fields.push(jQuery(this).attr('id'))
1412 });
1413
1414+<<<<<<< TREE
1415 var selected_fields = sum_fields.join(",");
1416 var selected_ids = '[' + selected_ids.join(',') + ']';
1417
1418@@ -112,6 +113,17 @@
1419 }
1420 }
1421 });
1422+=======
1423+ jQuery.post('/openerp/listgrid/count_sum',
1424+ {'model':this.model, 'ids': selected_ids.toSource(), 'sum_fields': sum_fields.toSource()},
1425+ function(obj) {
1426+ for(i in obj.sum) {
1427+ jQuery('tr.field_sum').find('td.grid-cell').find('span[id="'+sum_fields[i]+'"]').html(obj.sum[i])
1428+ }
1429+ },
1430+ "json"
1431+ );
1432+>>>>>>> MERGE-SOURCE
1433 }
1434 },
1435
1436@@ -286,7 +298,7 @@
1437
1438 if(eval(ids).length>0) {
1439 jQuery.post(
1440- '/listgrid/sort_by_order',
1441+ '/openerp/listgrid/sort_by_order',
1442 {'model': this.model, 'column': column, 'domain': domain, 'search_domain': search_domain, 'filter_domain': filter_domain, 'order': order},
1443 function(obj) {
1444 if(obj.error) {
1445@@ -373,7 +385,7 @@
1446 _list_view.dragRow(drag, drop);
1447 } else {
1448 jQuery.post(
1449- '/listgrid/groupbyDrag',
1450+ '/openerp/listgrid/groupbyDrag',
1451 {'model': _list_view.model, 'children': children, 'domain': domain},
1452 function () { _list_view.reload(); },
1453 "json");
1454@@ -389,7 +401,7 @@
1455 var view = jQuery(drag).parent().parent().attr('id').split("_grid")[0];
1456 var _list_view = new ListView(view);
1457 jQuery.post(
1458- '/listgrid/dragRow',
1459+ '/openerp/listgrid/dragRow',
1460 {'_terp_model': _list_view.model,
1461 '_terp_ids': _list_view.ids,
1462 '_terp_id': jQuery(drag).attr('record'),
1463@@ -407,7 +419,7 @@
1464 args['_terp_ids'] = this.ids;
1465 args['_terp_id'] = id;
1466
1467- var req = openobject.http.postJSON('/listgrid/moveUp', args);
1468+ var req = openobject.http.postJSON('/openerp/listgrid/moveUp', args);
1469 req.addCallback(function() {
1470 self.reload();
1471 });
1472@@ -422,7 +434,7 @@
1473 '_terp_id': id
1474 };
1475
1476- var req = openobject.http.postJSON('/listgrid/moveDown', args);
1477+ var req = openobject.http.postJSON('/openerp/listgrid/moveDown', args);
1478 req.addCallback(function() {
1479 self.reload();
1480 });
1481@@ -487,7 +499,7 @@
1482 var prefix = this.name == '_terp_list' ? '' : this.name + '/';
1483
1484 if (btype == "open") {
1485- return window.open(get_form_action('/form/edit', {
1486+ return window.open(get_form_action('/openerp/form/edit', {
1487 id: id,
1488 ids: openobject.dom.get(prefix + '_terp_ids').value,
1489 model: openobject.dom.get(prefix + '_terp_model').value,
1490@@ -511,7 +523,7 @@
1491 var req = eval_domain_context_request({source: this.name, context : context || '{}'});
1492 req.addCallback(function(res) {
1493 params['_terp_context'] = res.context;
1494- var req = openobject.http.postJSON('/listgrid/button_action', params);
1495+ var req = openobject.http.postJSON('/openerp/listgrid/button_action', params);
1496 req.addCallback(function(obj) {
1497 if (obj.error) {
1498 return alert(obj.error);
1499@@ -586,7 +598,7 @@
1500 args['_terp_source'] = this.name;
1501
1502 var self = this;
1503- var req = openobject.http.postJSON('/listgrid/save', args);
1504+ var req = openobject.http.postJSON('/openerp/listgrid/save', args);
1505
1506 req.addCallback(function(obj) {
1507 if (obj.error) {
1508@@ -636,7 +648,7 @@
1509 args['_terp_model'] = this.model;
1510 args['_terp_ids'] = ids;
1511
1512- var req = openobject.http.postJSON('/listgrid/remove', args);
1513+ var req = openobject.http.postJSON('/openerp/listgrid/remove', args);
1514
1515 req.addCallback(function(obj) {
1516 if (obj.error) {
1517@@ -712,7 +724,7 @@
1518 }
1519 }
1520
1521- var req = openobject.http.postJSON('/listgrid/get', args);
1522+ var req = openobject.http.postJSON('/openerp/listgrid/get', args);
1523 req.addCallback(function(obj) {
1524 var _terp_id = openobject.dom.get(self.name + '/_terp_id') || openobject.dom.get('_terp_id');
1525 var _terp_ids = openobject.dom.get(self.name + '/_terp_ids') || openobject.dom.get('_terp_ids');
1526@@ -815,7 +827,7 @@
1527
1528 ids = '[' + ids.join(',') + ']';
1529
1530- openobject.tools.openWindow(openobject.http.getURL('/impex/exp', {_terp_model: this.model,
1531+ openobject.tools.openWindow(openobject.http.getURL('/openerp/impex/exp', {_terp_model: this.model,
1532 _terp_source: this.name,
1533 _terp_search_domain: openobject.dom.get('_terp_search_domain').value,
1534 _terp_ids: ids,
1535@@ -824,7 +836,7 @@
1536 },
1537
1538 importData: function() {
1539- openobject.tools.openWindow(openobject.http.getURL('/impex/imp', {_terp_model: this.model,
1540+ openobject.tools.openWindow(openobject.http.getURL('/openerp/impex/imp', {_terp_model: this.model,
1541 _terp_source: this.name,
1542 _terp_view_ids : this.view_ids,
1543 _terp_view_mode : this.view_mode}));
1544
1545=== modified file 'addons/openerp/static/javascript/m2o.js'
1546--- addons/openerp/static/javascript/m2o.js 2010-05-03 12:12:25 +0000
1547+++ addons/openerp/static/javascript/m2o.js 2010-05-18 12:04:29 +0000
1548@@ -166,7 +166,7 @@
1549 var req = eval_domain_context_request({source: source, domain: domain, context: context});
1550
1551 req.addCallback(function(obj){
1552- openobject.tools.openWindow(openobject.http.getURL('/openm2o/edit', {_terp_model: model, _terp_id: id,
1553+ openobject.tools.openWindow(openobject.http.getURL('/openerp/openm2o/edit', {_terp_model: model, _terp_id: id,
1554 _terp_domain: obj.domain, _terp_context: obj.context,
1555 _terp_m2o: source, _terp_editable: editable}));
1556 });
1557@@ -179,7 +179,7 @@
1558 }
1559
1560 if (this.field.value && ! this.text.value){
1561- var req = openobject.http.postJSON('/search/get_name', {model: this.relation, id : this.field.value});
1562+ var req = openobject.http.postJSON('/openerp/search/get_name', {model: this.relation, id : this.field.value});
1563 var text_field = this.text;
1564
1565 req.addCallback(function(obj){
1566@@ -397,7 +397,7 @@
1567 req.addCallback(function(obj){
1568 text = m2o.field.value ? '' : m2o.text.value;
1569
1570- var req2 = openobject.http.postJSON('/search/get_matched', {model: m2o.relation, text: text,
1571+ var req2 = openobject.http.postJSON('/openerp/search/get_matched', {model: m2o.relation, text: text,
1572 _terp_domain: obj.domain,
1573 _terp_context: obj.context});
1574
1575@@ -462,7 +462,7 @@
1576 element['text'] = val
1577 element['model'] = this.relation
1578
1579- var d = loadJSONDoc('/search/get_matched' + "?" + queryString(element));
1580+ var d = loadJSONDoc('/openerp/search/get_matched' + "?" + queryString(element));
1581 d.addCallback(this.displayResults);
1582 return true;
1583 }
1584
1585=== modified file 'addons/openerp/static/javascript/o2m.js'
1586--- addons/openerp/static/javascript/o2m.js 2010-04-23 07:19:05 +0000
1587+++ addons/openerp/static/javascript/o2m.js 2010-05-18 12:04:29 +0000
1588@@ -113,7 +113,7 @@
1589 _terp_editable: readonly ? 0 : 1});
1590
1591 if (id && id != 'False' && !this.default_get_ctx){
1592- return openobject.tools.openWindow(openobject.http.getURL('/openo2m/edit', params));
1593+ return openobject.tools.openWindow(openobject.http.getURL('/openerp/openo2m/edit', params));
1594 }
1595
1596 var req = eval_domain_context_request({source: this.name, context : this.default_get_ctx});
1597@@ -124,13 +124,13 @@
1598 if (!window.browser.isIE) {
1599 params['_terp_o2m_context'] = res.context;
1600 params['_terp_parent_context'] = this.parent_context;
1601- return openobject.tools.openWindow(openobject.http.getURL('/openo2m/edit', params));
1602+ return openobject.tools.openWindow(openobject.http.getURL('/openerp/openo2m/edit', params));
1603 }
1604
1605 openobject.http.setCookie('_terp_o2m_context', res.context || '{}');
1606 openobject.http.setCookie('_terp_parent_context', this.parent_context || '{}');
1607 try {
1608- return openobject.tools.openWindow(openobject.http.getURL('/openo2m/edit', params));
1609+ return openobject.tools.openWindow(openobject.http.getURL('/openerp/openo2m/edit', params));
1610 } finally {
1611 openobject.http.delCookie('_terp_o2m_context');
1612 openobject.http.delCookie('_terp_parent_context');
1613
1614=== modified file 'addons/openerp/static/javascript/search.js'
1615--- addons/openerp/static/javascript/search.js 2010-05-18 11:44:41 +0000
1616+++ addons/openerp/static/javascript/search.js 2010-05-18 12:04:29 +0000
1617@@ -196,7 +196,7 @@
1618 record = serializeJSON(record);
1619 params['record'] = record;
1620 var custom_domain = [];
1621- var search_req = openobject.http.postJSON('/search/get', params);
1622+ var search_req = openobject.http.postJSON('/openerp/search/get', params);
1623 search_req.addCallback(function(obj){
1624 if (obj.error) {
1625 forEach(children, function(child){
1626@@ -340,7 +340,7 @@
1627 }
1628
1629 var final_search_domain = function(custom_domain, all_domains, group_by_ctx) {
1630- var req = openobject.http.postJSON('/search/eval_domain_filter',
1631+ var req = openobject.http.postJSON('/openerp/search/eval_domain_filter',
1632 {source: '_terp_list',
1633 model: $('_terp_model').value,
1634 custom_domain: custom_domain,
1635@@ -357,7 +357,7 @@
1636 if(group_by_ctx!=''){
1637 params['group_by'] = group_by_ctx;
1638 }
1639- openobject.tools.openWindow(openobject.http.getURL('/search/save_filter', params), {
1640+ openobject.tools.openWindow(openobject.http.getURL('/openerp/search/save_filter', params), {
1641 width: 400,
1642 height: 250
1643 });
1644@@ -365,7 +365,7 @@
1645
1646 if (obj.action) { // For manage Filter
1647 action = serializeJSON(obj.action);
1648- window.location.href = openobject.http.getURL('/search/manage_filter', {action: action});
1649+ window.location.href = openobject.http.getURL('/openerp/search/manage_filter', {action: action});
1650 }
1651
1652 if (obj.domain) { // For direct search
1653
1654=== modified file 'addons/openerp/static/javascript/treeview.js'
1655--- addons/openerp/static/javascript/treeview.js 2010-04-16 09:48:56 +0000
1656+++ addons/openerp/static/javascript/treeview.js 2010-05-18 12:04:29 +0000
1657@@ -69,7 +69,7 @@
1658 '_terp_selection': '[' + selection + ']'
1659 };
1660
1661- setNodeAttribute(form, 'action', openobject.http.getURL('/tree/switch', args));
1662+ setNodeAttribute(form, 'action', openobject.http.getURL('/openerp/tree/switch', args));
1663 form.method = 'post';
1664 form.submit();
1665
1666
1667=== modified file 'addons/openerp/static/javascript/viewed.js'
1668--- addons/openerp/static/javascript/viewed.js 2009-10-22 09:49:28 +0000
1669+++ addons/openerp/static/javascript/viewed.js 2010-05-18 12:04:29 +0000
1670@@ -72,7 +72,7 @@
1671 return;
1672 }
1673
1674- var act = data.localName == 'view' ? '/viewed/remove_view' : '/viewed/save/remove';
1675+ var act = data.localName == 'view' ? '/openerp/viewed/remove_view' : '/openerp/viewed/save/remove';
1676
1677 var req = openobject.http.postJSON(act, {view_id: data.view_id, xpath_expr: getXPath(selected)});
1678 req.addCallback(function(obj){
1679@@ -101,7 +101,7 @@
1680 return;
1681 }
1682
1683- var req = openobject.http.post('/viewed/add', {view_id: data.view_id, xpath_expr: getXPath(selected)});
1684+ var req = openobject.http.post('/openerp/viewed/add', {view_id: data.view_id, xpath_expr: getXPath(selected)});
1685 req.addCallback(function(xmlHttp){
1686 var el = window.mbox.content;
1687 el.innerHTML = xmlHttp.responseText;
1688@@ -137,7 +137,7 @@
1689 params[el.name] = el.value;
1690 });
1691
1692- var act = openobject.dom.get('node').value == 'view' ? '/viewed/create_view' : '/viewed/save/node';
1693+ var act = openobject.dom.get('node').value == 'view' ? '/openerp/viewed/create_view' : '/openerp/viewed/save/node';
1694
1695 var req = openobject.http.postJSON(act, params);
1696 req.addCallback(function(obj) {
1697@@ -192,7 +192,7 @@
1698 return;
1699 };
1700
1701- var req = openobject.http.post('/viewed/edit', {view_id: data.view_id, xpath_expr: getXPath(selected)});
1702+ var req = openobject.http.post('/openerp/viewed/edit', {view_id: data.view_id, xpath_expr: getXPath(selected)});
1703 req.addCallback(function(xmlHttp){
1704
1705 var el = window.mbox.content;
1706@@ -249,7 +249,7 @@
1707 }
1708 });
1709
1710- var req = openobject.http.postJSON('/viewed/save/properties', params);
1711+ var req = openobject.http.postJSON('/openerp/viewed/save/properties', params);
1712 req.addCallback(function(obj){
1713
1714 if (obj.error){
1715@@ -291,7 +291,7 @@
1716 xpath_ref: getXPath(refNode)
1717 }
1718
1719- var req = openobject.http.postJSON('/viewed/save/move', params);
1720+ var req = openobject.http.postJSON('/openerp/viewed/save/move', params);
1721
1722 req.addCallback(function(obj) {
1723
1724@@ -350,7 +350,7 @@
1725 xpath_expr: getXPath(selected)
1726 };
1727
1728- var req = openobject.http.postJSON('/viewed/create_view', params);
1729+ var req = openobject.http.postJSON('/openerp/viewed/create_view', params);
1730 req.addCallback(function(obj) {
1731
1732 if (obj.error){
1733@@ -365,7 +365,7 @@
1734 }
1735
1736 var onPreview = function() {
1737- var act = openobject.http.getURL('/viewed/preview/show', {'model' : openobject.dom.get('view_model').value,
1738+ var act = openobject.http.getURL('/openerp/viewed/preview/show', {'model' : openobject.dom.get('view_model').value,
1739 'view_id' : openobject.dom.get('view_id').value,
1740 'view_type' : openobject.dom.get('view_type').value});
1741
1742@@ -377,7 +377,7 @@
1743 }
1744
1745 var onNew = function(model){
1746- var act = openobject.http.getURL('/viewed/new_field/edit', {'for_model' : model});
1747+ var act = openobject.http.getURL('/openerp/viewed/new_field/edit', {'for_model' : model});
1748 openobject.tools.openWindow(act, {width: 650, height: 400});
1749 }
1750
1751
1752=== modified file 'addons/openerp/static/javascript/wizard.js'
1753--- addons/openerp/static/javascript/wizard.js 2010-01-12 07:31:28 +0000
1754+++ addons/openerp/static/javascript/wizard.js 2010-05-18 12:04:29 +0000
1755@@ -44,14 +44,14 @@
1756 function wizardAction(state) {
1757
1758 var form = document.forms['view_form'];
1759- var act = '/wizard/action';
1760+ var act = '/openerp/wizard/action';
1761
1762 if (state == 'end'){
1763- act = '/wizard/end';
1764+ act = '/openerp/wizard/end';
1765 }
1766
1767 if (state == 'report'){
1768- act = '/wizard/report';
1769+ act = '/openerp/wizard/report';
1770 }
1771
1772 if (state != 'end' && !validate_required(form)) {
1773
1774=== modified file 'addons/openerp/widgets/form/_binary.py'
1775--- addons/openerp/widgets/form/_binary.py 2010-03-08 11:44:48 +0000
1776+++ addons/openerp/widgets/form/_binary.py 2010-05-18 12:04:29 +0000
1777@@ -92,7 +92,7 @@
1778 if 'widget' in attrs:
1779 self.stock = False
1780 self.field = self.name.split('/')[-1]
1781- self.src = tools.url('/image/get_image', model=self.model, id=self.id, field=self.field)
1782+ self.src = tools.url('/openerp/image/get_image', model=self.model, id=self.id, field=self.field)
1783 self.height = attrs.get('img_height', attrs.get('height', 160))
1784 self.width = attrs.get('img_width', attrs.get('width', 200))
1785 self.validator = validators.Binary()
1786@@ -129,7 +129,7 @@
1787 finally:
1788 tmp.close()
1789
1790- url = tools.url("/image/get_picture", hash=hashkey)
1791+ url = tools.url("/openerp/image/get_picture", hash=hashkey)
1792 else:
1793 url = tools.url("/static/images/blank.gif")
1794
1795
1796=== modified file 'addons/openerp/widgets/form/templates/image.mako'
1797--- addons/openerp/widgets/form/templates/image.mako 2009-11-12 09:32:46 +0000
1798+++ addons/openerp/widgets/form/templates/image.mako 2010-05-18 12:04:29 +0000
1799@@ -15,7 +15,7 @@
1800 src="${src}"
1801 width="${width}"
1802 height="${height}"
1803- onclick="openobject.tools.openWindow(openobject.http.getURL('/image', {model: '${model}', id: ${id}, field : '${field}'}), {width: 500, height: 300});"/>
1804+ onclick="openobject.tools.openWindow(openobject.http.getURL('/openerp/image', {model: '${model}', id: ${id}, field : '${field}'}), {width: 500, height: 300});"/>
1805 % endif
1806
1807 % if not stock and id and not editable:
1808
1809=== modified file 'addons/openerp/widgets/form/templates/many2one.mako'
1810--- addons/openerp/widgets/form/templates/many2one.mako 2010-03-26 10:19:23 +0000
1811+++ addons/openerp/widgets/form/templates/many2one.mako 2010-05-18 12:04:29 +0000
1812@@ -55,7 +55,7 @@
1813 % if not editable and link:
1814 % if link=='1':
1815 <span id="${name}" ${py.attrs(kind=kind, value=value)}>
1816- <a href="${py.url('/form/view', model=relation, id=value)}">${text}</a>
1817+ <a href="${py.url('/openerp/form/view', model=relation, id=value)}">${text}</a>
1818 </span>
1819 % endif
1820 % if link=='0':
1821@@ -66,7 +66,7 @@
1822 % if not editable and not link == '0':
1823 <span>
1824 <span id="${name}" ${py.attrs(kind=kind, value=value, relation=relation)}>
1825- <a href="${py.url('/form/view', model=relation, id=value)}">${text}</a>
1826+ <a href="${py.url('/openerp/form/view', model=relation, id=value)}">${text}</a>
1827 </span>
1828 </span>
1829 % endif
1830
1831=== modified file 'addons/openerp/widgets/form/templates/one2many.mako'
1832--- addons/openerp/widgets/form/templates/one2many.mako 2010-04-30 09:31:54 +0000
1833+++ addons/openerp/widgets/form/templates/one2many.mako 2010-05-18 12:04:29 +0000
1834@@ -40,7 +40,7 @@
1835 % if not screen.editable and screen.view_type=='form':
1836 <img class="button" title="${_('Translate me.')}" alt="${_('Translate me.')}"
1837 src="/openerp/static/images/stock/stock_translate.png" width="16" height="16"
1838- onclick="openobject.tools.openWindow('${py.url('/translator', _terp_model=screen.model, _terp_id=screen.id)}')"/>
1839+ onclick="openobject.tools.openWindow('${py.url('/openerp/translator', _terp_model=screen.model, _terp_id=screen.id)}')"/>
1840 % endif
1841 </td>
1842 </tr>
1843
1844=== modified file 'addons/openerp/widgets/listgrid.py'
1845--- addons/openerp/widgets/listgrid.py 2010-05-18 11:44:41 +0000
1846+++ addons/openerp/widgets/listgrid.py 2010-05-18 12:04:29 +0000
1847@@ -429,7 +429,7 @@
1848 m2o_link = int(self.attrs.get('link', 1))
1849
1850 if m2o_link == 1:
1851- return tools.url('/form/view', model=self.attrs['relation'], id=(self.value or False) and self.value[0])
1852+ return tools.url('/openerp/form/view', model=self.attrs['relation'], id=(self.value or False) and self.value[0])
1853 else:
1854 return None
1855
1856
1857=== modified file 'addons/openerp/widgets/search.py'
1858--- addons/openerp/widgets/search.py 2010-05-11 07:03:33 +0000
1859+++ addons/openerp/widgets/search.py 2010-05-18 12:04:29 +0000
1860@@ -91,7 +91,7 @@
1861 super(Filter, self).__init__(**attrs)
1862
1863 flag = True
1864- if cherrypy.request.path_info == '/tree/open':
1865+ if cherrypy.request.path_info == '/openerp/tree/open':
1866 flag = False
1867
1868 default_domain = attrs.get('default_domain')
1869
1870=== modified file 'addons/openerp/widgets/templates/sidebar.mako'
1871--- addons/openerp/widgets/templates/sidebar.mako 2010-03-16 19:44:54 +0000
1872+++ addons/openerp/widgets/templates/sidebar.mako 2010-05-18 12:04:29 +0000
1873@@ -24,7 +24,7 @@
1874 <%def name="sidebox_attach_item(item, model)">
1875 <tr>
1876 <td>
1877- <a href="${py.url(['/attachment/save_as', item[1]], record=item[0])}">${item[1]}</a>
1878+ <a href="${py.url(['/openerp/attachment/save_as', item[1]], record=item[0])}">${item[1]}</a>
1879 </td>
1880 </tr>
1881 </%def>
1882
1883=== modified file 'addons/openerp/widgets/tree_view.py'
1884--- addons/openerp/widgets/tree_view.py 2010-04-16 08:58:24 +0000
1885+++ addons/openerp/widgets/tree_view.py 2010-05-18 12:04:29 +0000
1886@@ -102,7 +102,7 @@
1887 self.tree = treegrid.TreeGrid(name="tree_%s" % (id),
1888 model=self.model,
1889 headers=self.headers,
1890- url=url("/tree/data"),
1891+ url=url("/openerp/tree/data"),
1892 ids=ids,
1893 domain=self.domain,
1894 context=self.context,
1895
1896=== modified file 'addons/view_calendar/controllers/_calendar.py'
1897--- addons/view_calendar/controllers/_calendar.py 2010-03-08 11:44:48 +0000
1898+++ addons/view_calendar/controllers/_calendar.py 2010-05-18 12:04:29 +0000
1899@@ -47,7 +47,7 @@
1900
1901 class TinyCalendar(Form):
1902
1903- _cp_path = "/calendar"
1904+ _cp_path = "/view_calendar/calendar"
1905
1906 @expose()
1907 def mini(self, year, month, forweek=False):
1908@@ -264,13 +264,13 @@
1909
1910 class CalendarPopup(Form):
1911
1912- _cp_path = "/calpopup"
1913+ _cp_path = "/view_calendar/calpopup"
1914
1915 @expose(template="templates/calpopup.mako")
1916 def create(self, params, tg_errors=None):
1917 params.editable = True
1918
1919- if params.id and cherrypy.request.path_info == '/calpopup/view':
1920+ if params.id and cherrypy.request.path_info == '/view_calendar/calpopup/view':
1921 params.load_counter = 2
1922
1923 form = self.create_form(params, tg_errors)
1924
1925=== modified file 'addons/view_calendar/controllers/templates/calpopup.mako'
1926--- addons/view_calendar/controllers/templates/calpopup.mako 2010-02-04 12:16:22 +0000
1927+++ addons/view_calendar/controllers/templates/calpopup.mako 2010-05-18 12:04:29 +0000
1928@@ -4,7 +4,7 @@
1929 <title>${form.screen.string}</title>
1930
1931 <script type="text/javascript">
1932- var form_controller = '/calpopup';
1933+ var form_controller = '/view_calendar/calpopup';
1934 </script>
1935
1936 <script type="text/javascript">
1937@@ -23,7 +23,7 @@
1938 '_terp_context': openobject.dom.get('_terp_context').value
1939 }
1940
1941- var req = openobject.http.postJSON('/calpopup/get_defaults', params);
1942+ var req = openobject.http.postJSON('/view_calendar/calpopup/get_defaults', params);
1943 req.addCallback(function(obj){
1944 forEach(items(obj), function(item){
1945 var k = item[0];
1946
1947=== modified file 'addons/view_calendar/static/javascript/calendar_box.js'
1948--- addons/view_calendar/static/javascript/calendar_box.js 2009-11-02 06:23:10 +0000
1949+++ addons/view_calendar/static/javascript/calendar_box.js 2010-05-18 12:04:29 +0000
1950@@ -166,7 +166,7 @@
1951 '_terp_context': openobject.dom.get('_terp_context').value
1952 });
1953
1954- var req = openobject.http.postJSON('/calendar/delete', params);
1955+ var req = openobject.http.postJSON('/view_calendar/calendar/delete', params);
1956 var self = this;
1957
1958 req.addCallback(function(obj){
1959
1960=== modified file 'addons/view_calendar/static/javascript/calendar_gantt.js'
1961--- addons/view_calendar/static/javascript/calendar_gantt.js 2009-10-22 09:49:28 +0000
1962+++ addons/view_calendar/static/javascript/calendar_gantt.js 2010-05-18 12:04:29 +0000
1963@@ -520,7 +520,7 @@
1964 }
1965
1966 var self = this;
1967- var req = openobject.http.postJSON('/calendar/gantt_reorder', params);
1968+ var req = openobject.http.postJSON('/view_calendar/calendar/gantt_reorder', params);
1969 req.addCallback(function(obj){
1970 if (obj.error) {
1971 return alert(obj.error);
1972
1973=== modified file 'addons/view_calendar/static/javascript/calendar_utils.js'
1974--- addons/view_calendar/static/javascript/calendar_utils.js 2009-11-02 06:23:10 +0000
1975+++ addons/view_calendar/static/javascript/calendar_utils.js 2010-05-18 12:04:29 +0000
1976@@ -76,7 +76,7 @@
1977 var day = day || openobject.dom.get('_terp_selected_day').value;
1978 var mode = mode || openobject.dom.get('_terp_selected_mode').value;
1979
1980- var act = openobject.http.getURL('/calendar/get', {day: day, mode: mode});
1981+ var act = openobject.http.getURL('/view_calendar/calendar/get', {day: day, mode: mode});
1982
1983 var form = document.forms['view_form'];
1984 var contents = formContents(form);
1985@@ -164,7 +164,7 @@
1986 '_terp_context': openobject.dom.get('_terp_context').value
1987 });
1988
1989- var req = openobject.http.postJSON('/calendar/save', params);
1990+ var req = openobject.http.postJSON('/view_calendar/calendar/save', params);
1991 return req.addCallback(function(obj){
1992
1993 // update concurrency info
1994@@ -193,7 +193,7 @@
1995 'context': openobject.dom.get('_terp_context').value
1996 }
1997
1998- var act = openobject.http.getURL('/calpopup/edit', params);
1999+ var act = openobject.http.getURL('/view_calendar/calpopup/edit', params);
2000 openobject.tools.openWindow(act);
2001 }
2002
2003@@ -205,7 +205,7 @@
2004 '_terp_context': openobject.dom.get('_terp_context').value
2005 }
2006
2007- return openobject.http.post('/calendar/duplicate', params);
2008+ return openobject.http.post('/view_calendar/calendar/duplicate', params);
2009 }
2010
2011 // vim: ts=4 sts=4 sw=4 si et
2012
2013=== modified file 'addons/view_calendar/widgets/templates/mini.mako'
2014--- addons/view_calendar/widgets/templates/mini.mako 2010-01-11 09:32:25 +0000
2015+++ addons/view_calendar/widgets/templates/mini.mako 2010-05-18 12:04:29 +0000
2016@@ -1,11 +1,11 @@
2017 <div id="MiniCalendar">
2018 <table class="calMini" width="100%" cellpadding="2" cellspacing="1" border="0">
2019 <tr class="calMiniHeader">
2020- <td nowrap="nowrap"><img height="16" width="16" class="button" src="/openerp/static/images/stock/gtk-go-back.png" onclick="getMiniCalendar('${py.url('/calendar/mini', year=month.prev().year, month=month.prev().month, forweek=forweek)}')"/></td>
2021+ <td nowrap="nowrap"><img height="16" width="16" class="button" src="/openerp/static/images/stock/gtk-go-back.png" onclick="getMiniCalendar('${py.url('/view_calendar/calendar/mini', year=month.prev().year, month=month.prev().month, forweek=forweek)}')"/></td>
2022 <td nowrap="nowrap" width="100%" align="center" colspan="5">
2023 <strong><a href="javascript: void(0)" onclick="getCalendar('${month.year}-${month.month}-01', 'month'); return false;">${month}</a></strong>
2024 </td>
2025- <td nowrap="nowrap"><img height="16" width="16" class="button" src="/openerp/static/images/stock/gtk-go-forward.png" onclick="getMiniCalendar('${py.url('/calendar/mini', year=month.next().year, month=month.next().month, forweek=forweek)}')"/></td>
2026+ <td nowrap="nowrap"><img height="16" width="16" class="button" src="/openerp/static/images/stock/gtk-go-forward.png" onclick="getMiniCalendar('${py.url('/view_calendar/calendar/mini', year=month.next().year, month=month.next().month, forweek=forweek)}')"/></td>
2027 </tr>
2028 <tr class="calMiniTitles">
2029 <td>M</td>
2030
2031=== modified file 'addons/view_diagram/controllers/_diagram.py'
2032--- addons/view_diagram/controllers/_diagram.py 2010-04-01 11:24:46 +0000
2033+++ addons/view_diagram/controllers/_diagram.py 2010-05-18 12:04:29 +0000
2034@@ -37,7 +37,7 @@
2035
2036 class State(Form):
2037
2038- _cp_path = "/workflow/state"
2039+ _cp_path = "/view_diagram/workflow/state"
2040
2041 @expose(template="templates/wkf_popup.mako")
2042 def create(self, params, tg_errors=None):
2043@@ -140,7 +140,7 @@
2044
2045 class Connector(Form):
2046
2047- _cp_path = "/workflow/connector"
2048+ _cp_path = "/view_diagram/workflow/connector"
2049
2050 @expose(template="templates/wkf_popup.mako")
2051 def create(self, params, tg_errors=None):
2052@@ -236,7 +236,7 @@
2053
2054 class Workflow(Form):
2055
2056- _cp_path = "/workflow"
2057+ _cp_path = "/view_diagram/workflow"
2058
2059 @expose(template="templates/workflow.mako")
2060 def index(self, model, rec_id=None):
2061
2062=== modified file 'addons/view_diagram/controllers/process.py'
2063--- addons/view_diagram/controllers/process.py 2010-04-05 09:33:28 +0000
2064+++ addons/view_diagram/controllers/process.py 2010-05-18 12:04:29 +0000
2065@@ -37,7 +37,7 @@
2066
2067 class Process(SecuredController):
2068
2069- _cp_path = "/process"
2070+ _cp_path = "/view_diagram/process"
2071
2072 @expose(template="templates/process.mako")
2073 def default(self, id=False, res_model=None, res_id=False):
2074
2075=== modified file 'addons/view_diagram/controllers/templates/process.mako'
2076--- addons/view_diagram/controllers/templates/process.mako 2010-04-05 09:33:28 +0000
2077+++ addons/view_diagram/controllers/templates/process.mako 2010-05-18 12:04:29 +0000
2078@@ -23,7 +23,7 @@
2079 var id = parseInt(openobject.dom.get('select_workflow').value) || null;
2080 var res_model = openobject.dom.get('res_model').value || null;
2081 var res_id = parseInt(openobject.dom.get('res_id').value) || null;
2082- window.location.href = openobject.http.getURL("/process", {id: id, res_model: res_model, res_id: res_id});
2083+ window.location.href = openobject.http.getURL("/view_diagram/process", {id: id, res_model: res_model, res_id: res_id});
2084 }
2085 </script>
2086 % endif
2087@@ -83,7 +83,7 @@
2088 </tr>
2089 <tr>
2090 <td class="dimmed-text">
2091- [<a target="_blank" href="${py.url('/form/edit', model='process.process', id=id)}">${_("Customize")}</a>]
2092+ [<a target="_blank" href="${py.url('/openerp/form/edit', model='process.process', id=id)}">${_("Customize")}</a>]
2093 </td>
2094 </tr>
2095 </table>
2096
2097=== modified file 'addons/view_diagram/controllers/templates/process_open.mako'
2098--- addons/view_diagram/controllers/templates/process_open.mako 2010-03-26 07:36:34 +0000
2099+++ addons/view_diagram/controllers/templates/process_open.mako 2010-05-18 12:04:29 +0000
2100@@ -4,7 +4,7 @@
2101 <title>${form.screen.string}</title>
2102
2103 <script type="text/javascript">
2104- var form_controller = '/process/resource';
2105+ var form_controller = '/view_diagram/process/resource';
2106 </script>
2107
2108 <script type="text/javascript">
2109
2110=== modified file 'addons/view_diagram/static/javascript/connector.js'
2111--- addons/view_diagram/static/javascript/connector.js 2010-04-01 11:24:46 +0000
2112+++ addons/view_diagram/static/javascript/connector.js 2010-05-18 12:04:29 +0000
2113@@ -109,7 +109,7 @@
2114 if(!isUndefinedOrNull(this.tr_id))
2115 params['_terp_id'] = this.tr_id;
2116
2117- var act = openobject.http.getURL('/workflow/connector/edit', params);
2118+ var act = openobject.http.getURL('/view_diagram/workflow/connector/edit', params);
2119 openobject.tools.openWindow(act);
2120 }
2121
2122@@ -130,7 +130,7 @@
2123 else if(this.sourceId != port.getParent().get_act_id()) {
2124 this.sourceId = port.getParent().get_act_id();
2125
2126- req = openobject.http.postJSON('/workflow/connector/change_ends', {conn_obj: WORKFLOW.connector_obj,
2127+ req = openobject.http.postJSON('/view_diagram/workflow/connector/change_ends', {conn_obj: WORKFLOW.connector_obj,
2128 id: this.tr_id,
2129 field: WORKFLOW.src_node_nm,
2130 value: this.sourceId});
2131@@ -145,7 +145,7 @@
2132 else if(this.destId != port.getParent().get_act_id()) {
2133 this.destId = port.getParent().get_act_id();
2134
2135- req = openobject.http.postJSON('/workflow/connector/change_ends', {conn_obj: WORKFLOW.connector_obj,
2136+ req = openobject.http.postJSON('/view_diagram/workflow/connector/change_ends', {conn_obj: WORKFLOW.connector_obj,
2137 id: this.tr_id,
2138 field: WORKFLOW.des_node_nm,
2139 value: this.destId});
2140
2141=== modified file 'addons/view_diagram/static/javascript/process.js'
2142--- addons/view_diagram/static/javascript/process.js 2010-04-05 09:33:28 +0000
2143+++ addons/view_diagram/static/javascript/process.js 2010-05-18 12:04:29 +0000
2144@@ -72,7 +72,7 @@
2145 this.res_id = res_id;
2146
2147 var self = this;
2148- var req = openobject.http.postJSON('/process/get', {id: id, res_model: res_model, res_id: res_id});
2149+ var req = openobject.http.postJSON('/view_diagram/process/get', {id: id, res_model: res_model, res_id: res_id});
2150 req.addCallback(function(obj){
2151 self._render(obj.title, obj.perm, obj.notes, obj.nodes, obj.transitions, obj.related);
2152 });
2153@@ -177,12 +177,12 @@
2154
2155 for(var k in subflows) {
2156 if (k != this.process_id)
2157- sflows += "<a href='" + openobject.http.getURL('/process', {id: k, res_model: self.res_model, res_id: self.res_id}) + "'>" + subflows[k] + "</a><br/>";
2158+ sflows += "<a href='" + openobject.http.getURL('/view_diagram/process', {id: k, res_model: self.res_model, res_id: self.res_id}) + "'>" + subflows[k] + "</a><br/>";
2159 }
2160
2161 for(var k in related) {
2162 if (k != this.process_id)
2163- rflows += "<a href='" + openobject.http.getURL('/process', {id: k, res_model: self.res_model, res_id: self.res_id}) + "'>" + related[k] + "</a><br/>";
2164+ rflows += "<a href='" + openobject.http.getURL('/view_diagram/process', {id: k, res_model: self.res_model, res_id: self.res_id}) + "'>" + related[k] + "</a><br/>";
2165 }
2166
2167 var text = (
2168@@ -264,7 +264,7 @@
2169 text.innerHTML = this.data.notes || '';
2170
2171 if (this.data.subflow && this.data.subflow.length) {
2172- var href = openobject.http.getURL('/process', {id: this.data.subflow[0], res_model: this.data.res_model, res_id: this.data.res_id});
2173+ var href = openobject.http.getURL('/view_diagram/process', {id: this.data.subflow[0], res_model: this.data.res_model, res_id: this.data.res_id});
2174 title.innerHTML = "<a href='" + href + "'>" + this.data.name + "</a>";
2175 }
2176
2177@@ -278,7 +278,7 @@
2178 var menu_img = IMG({src: '/openerp/static/images/stock/gtk-jump-to.png'});
2179 menu_img.title = this.data.menu.name;
2180 menu_img.onclick = MochiKit.Base.bind(function(){
2181- window.location.href = openobject.http.getURL('/tree/open', {model: 'ir.ui.menu', id: this.data.menu.id});
2182+ window.location.href = openobject.http.getURL('/openerp/tree/open', {model: 'ir.ui.menu', id: this.data.menu.id});
2183 }, this);
2184 MochiKit.DOM.appendChildNodes(menu, menu_img);
2185 }
2186
2187=== modified file 'addons/view_diagram/static/javascript/state.js'
2188--- addons/view_diagram/static/javascript/state.js 2010-04-01 11:24:46 +0000
2189+++ addons/view_diagram/static/javascript/state.js 2010-05-18 12:04:29 +0000
2190@@ -132,7 +132,7 @@
2191 if(!isUndefinedOrNull(this.act_id))
2192 params['_terp_id'] = this.act_id;
2193
2194- var act = openobject.http.getURL('/workflow/state/edit', params);
2195+ var act = openobject.http.getURL('/view_diagram/workflow/state/edit', params);
2196 openobject.tools.openWindow(act);
2197 },
2198
2199
2200=== modified file 'addons/view_diagram/static/javascript/workflow.js'
2201--- addons/view_diagram/static/javascript/workflow.js 2010-04-01 11:24:46 +0000
2202+++ addons/view_diagram/static/javascript/workflow.js 2010-05-18 12:04:29 +0000
2203@@ -111,7 +111,7 @@
2204 this.id = wkf_id;
2205 var self = this;
2206
2207- req = openobject.http.postJSON('/workflow/get_info',{id:wkf_id, model:$('_terp_model').value,
2208+ req = openobject.http.postJSON('/view_diagram/workflow/get_info',{id:wkf_id, model:$('_terp_model').value,
2209 node_obj: self.node_obj, conn_obj:self.connector_obj,
2210 src_node: self.src_node_nm, des_node:self.des_node_nm,
2211 node_flds_v: this.node_flds_v, node_flds_h: this.node_flds_h, conn_flds: this.conn_flds,
2212@@ -273,7 +273,7 @@
2213 this.state.setPosition(100, 20);
2214 var self = this;
2215
2216- req = openobject.http.postJSON('/workflow/state/get_info',{node_obj: self.node_obj, id: id,
2217+ req = openobject.http.postJSON('/view_diagram/workflow/state/get_info',{node_obj: self.node_obj, id: id,
2218 node_flds_v: this.node_flds_v,
2219 node_flds_h: this.node_flds_h,
2220 bgcolors: this.bgcolors,
2221@@ -318,7 +318,7 @@
2222 create_connection : function(act_from, act_to) {
2223
2224 var self = this;
2225- req = openobject.http.postJSON('/workflow/connector/auto_create', {conn_obj: self.connector_obj,
2226+ req = openobject.http.postJSON('/view_diagram/workflow/connector/auto_create', {conn_obj: self.connector_obj,
2227 src: self.src_node_nm,
2228 des: self.des_node_nm,
2229 act_from: act_from,
2230@@ -360,7 +360,7 @@
2231 update_connection : function(id) {
2232
2233 var self = this;
2234- req = openobject.http.postJSON('/workflow/connector/get_info',{conn_obj: self.connector_obj, id: id});
2235+ req = openobject.http.postJSON('/view_diagram/workflow/connector/get_info',{conn_obj: self.connector_obj, id: id});
2236 req.addCallback(function(obj) {
2237 var n = self.connectors.getSize();
2238
2239@@ -385,7 +385,7 @@
2240 unlink_state : function(state) {
2241
2242 var self = this;
2243- req = openobject.http.postJSON('/workflow/state/delete', {node_obj: self.node_obj, 'id': state.get_act_id()});
2244+ req = openobject.http.postJSON('/view_diagram/workflow/state/delete', {node_obj: self.node_obj, 'id': state.get_act_id()});
2245 req.addCallback(function(obj) {
2246 if(!obj.error) {
2247 state.__delete__();
2248@@ -428,7 +428,7 @@
2249 unlink_connector : function(conn) {
2250
2251 var self = this;
2252- req = openobject.http.postJSON('/workflow/connector/delete', {conn_obj: self.connector_obj, 'id': conn.get_tr_id()});
2253+ req = openobject.http.postJSON('/view_diagram/workflow/connector/delete', {conn_obj: self.connector_obj, 'id': conn.get_tr_id()});
2254 req.addCallback(function(obj) {
2255 if(!obj.error) {
2256 conn.__delete__();
2257
2258=== modified file 'addons/view_graph/widgets/_graph.py'
2259--- addons/view_graph/widgets/_graph.py 2010-03-08 11:44:48 +0000
2260+++ addons/view_graph/widgets/_graph.py 2010-05-18 12:04:29 +0000
2261@@ -476,14 +476,14 @@
2262 ids = s.split('/')[1]
2263 ids = eval(ids)
2264 dom = [('id', 'in', ids)]
2265- u = url_plus('/form/find', _terp_view_type='tree', _terp_view_mode="['tree', 'graph']",
2266+ u = url_plus('/openerp/form/find', _terp_view_type='tree', _terp_view_mode="['tree', 'graph']",
2267 _terp_domain=ustr(dom), _terp_model=self.model, _terp_context=ustr(ctx))
2268
2269 url.append(u)
2270
2271 else:
2272 for dom in domain:
2273- u = url_plus('/form/find', _terp_view_type='tree', _terp_view_mode="['tree', 'graph']",
2274+ u = url_plus('/openerp/form/find', _terp_view_type='tree', _terp_view_mode="['tree', 'graph']",
2275 _terp_domain=ustr(dom), _terp_model=self.model, _terp_context=ustr(ctx))
2276
2277 url.append(u)
2278@@ -614,7 +614,7 @@
2279 url = []
2280
2281 for dom in domain:
2282- u = url_plus('/form/find', _terp_view_type='tree', _terp_view_mode="['tree', 'graph']",
2283+ u = url_plus('/openerp/form/find', _terp_view_type='tree', _terp_view_mode="['tree', 'graph']",
2284 _terp_domain=ustr(dom), _terp_model=self.model, _terp_context=ustr(ctx))
2285
2286 url.append(u)
2287
2288=== modified file 'addons/widget_wiki/controllers/wiki.py'
2289--- addons/widget_wiki/controllers/wiki.py 2010-03-08 11:44:48 +0000
2290+++ addons/widget_wiki/controllers/wiki.py 2010-05-18 12:04:29 +0000
2291@@ -53,7 +53,7 @@
2292
2293 class WikiView(SecuredController):
2294
2295- _cp_path = "/wiki"
2296+ _cp_path = "/widget_wiki/wiki"
2297
2298 @expose(content_type='application/octet')
2299 def getImage(self, *kw, **kws):
2300
2301=== modified file 'addons/widget_wiki/widgets/wiki.py'
2302--- addons/widget_wiki/widgets/wiki.py 2010-03-08 11:44:48 +0000
2303+++ addons/widget_wiki/widgets/wiki.py 2010-05-18 12:04:29 +0000
2304@@ -94,7 +94,7 @@
2305 id = int(text)
2306 except:
2307 id = 0
2308- return "[[/form/view?model=%s&amp;id=%d | %s]]" % (model, id, label)
2309+ return "[[/openerp/form/view?model=%s&amp;id=%d | %s]]" % (model, id, label)
2310
2311 bits = _view.sub(record, text)
2312 return bits
2313@@ -124,9 +124,9 @@
2314 proxy = rpc.RPCProxy('ir.attachment')
2315 ids = proxy.search([('datas_fname','=',file.strip()), ('res_model','=','wiki.wiki'), ('res_id','=',id)])
2316 if len(ids) > 0:
2317- return "<a href='/wiki/getfile?file=%s&amp;id=%d'>%s</a>" % (file, id, file)
2318+ return "<a href='/widget_wiki/wiki/getfile?file=%s&amp;id=%d'>%s</a>" % (file, id, file)
2319 else:
2320- return """<a onclick="openobject.tools.openWindow(openobject.http.getURL('/attachment', {model: 'wiki.wiki', id: %d}),
2321+ return """<a onclick="openobject.tools.openWindow(openobject.http.getURL('/openerp/attachment', {model: 'wiki.wiki', id: %d}),
2322 {name : 'Wiki Attachments'})">Attach : %s </a>""" % (id, file)
2323 bits = _attach.sub(document, text)
2324 return bits
2325@@ -140,9 +140,9 @@
2326 proxy = rpc.RPCProxy('ir.attachment')
2327 ids = proxy.search([('datas_fname','=',file.strip()), ('res_model','=','wiki.wiki'), ('res_id','=',id)])
2328 if len(ids) > 0:
2329- return "<img src='/wiki/getImage?file=%s&amp;id=%d'/>" % (file, id)
2330+ return "<img src='/widget_wiki/wiki/getImage?file=%s&amp;id=%d'/>" % (file, id)
2331 else:
2332- return """<a onclick="openobject.tools.openWindow(openobject.http.getURL('/attachment', {model: 'wiki.wiki', id: %d}),
2333+ return """<a onclick="openobject.tools.openWindow(openobject.http.getURL('/openerp/attachment', {model: 'wiki.wiki', id: %d}),
2334 {name : 'Wiki Attachments'})">Attach : %s </a>""" % (id, file)
2335 #"[[/attachment/?model=wiki.wiki&amp;id=%d | Attach:%s]]" % (id, file)
2336 bits = _image.sub(image, text)
2337@@ -165,7 +165,7 @@
2338 id = int(text)
2339 except:
2340 id = 0
2341- return "[[/form/edit?model=%s&amp;id=%d | %s]]" % (model, id, label)
2342+ return "[[/openerp/form/edit?model=%s&amp;id=%d | %s]]" % (model, id, label)
2343
2344 bits = _edit.sub(record, text)
2345 return bits
2346@@ -180,14 +180,14 @@
2347 link_str = ""
2348 if mids:
2349 if len(link) == 2:
2350- link_str = "<a href='/form/view?model=wiki.wiki&amp;id=%s'>%s</a>" % (mids[0], link[1])
2351+ link_str = "<a href='/openerp/form/view?model=wiki.wiki&amp;id=%s'>%s</a>" % (mids[0], link[1])
2352 elif len(link) == 1:
2353- link_str = "<a href='/form/view?model=wiki.wiki&amp;id=%s'>%s</a>" % (mids[0], link[0])
2354+ link_str = "<a href='/openerp/form/view?model=wiki.wiki&amp;id=%s'>%s</a>" % (mids[0], link[0])
2355 else:
2356 if len(link) == 2:
2357 link_str = "<a href='%s'>%s</a>" % (link[0], link[1])
2358 elif len(link) == 1:
2359- link_str = "<a href='/form/edit?model=wiki.wiki&amp;id=False'>%s</a>" % (link[0])
2360+ link_str = "<a href='/openerp/form/edit?model=wiki.wiki&amp;id=False'>%s</a>" % (link[0])
2361
2362 return link_str
2363
2364
2365=== modified file 'openobject/controllers/_base.py'
2366--- openobject/controllers/_base.py 2010-03-08 11:44:48 +0000
2367+++ openobject/controllers/_base.py 2010-05-18 12:04:29 +0000
2368@@ -43,7 +43,7 @@
2369
2370 obj = super(ControllerType, cls).__new__(cls, name, bases, attrs)
2371 path = attrs.get("_cp_path")
2372-
2373+
2374 if "path" in attrs and name != "BaseController":
2375 raise Exception("Can't override 'path' attribute.")
2376
2377
2378=== modified file 'openobject/controllers/_root.py'
2379--- openobject/controllers/_root.py 2010-03-08 11:44:48 +0000
2380+++ openobject/controllers/_root.py 2010-05-18 12:04:29 +0000
2381@@ -30,12 +30,11 @@
2382 request = cherrypy.request
2383 path = request.path_info
2384 app = request.app
2385-
2386+
2387 pool = request.pool = pooler.get_pool()
2388
2389 names = [x for x in path.strip("/").split("/") if x] + ["index"]
2390-
2391- node = pool.get_controller("/")
2392+ node = pool.get_controller("/openerp")
2393 trail = [["/", node]]
2394
2395 curpath = ""

Subscribers

People subscribed via source and target branches