Commit Graph
64 Commits
Author SHA1 Message Date
Christophe Simonis a61e7cb0c8 [MERGE] forward port of branch saas-1 up to revid 4887 chs@openerp.com-20130612153934-qyp6pb3bc4za4taf
bzr revid: chs@openerp.com-20130613172414-dln3g4j0ykcwaa02
bzr revid: chs@openerp.com-20130613173900-xl7rh321nnw2b04b
2013-06-13 19:39:00 +02:00
Christophe Simonis 6263673720 [MERGE] forward port of branch 7.0 up to revid 3973 chs@openerp.com-20130611145028-f98x6inytlr3ijjg
bzr revid: chs@openerp.com-20130611155251-zk0qkk70z30n81vl
2013-06-11 17:52:51 +02:00
niv-openerp a94bbf8e5e [FIX] Merge fix in saas1 for the problem that made the server crash when install a db
bzr revid: nicolas.vanhoren@openerp.com-20130610144915-0nj8vpk7n84ocj3f
bzr revid: nicolas.vanhoren@openerp.com-20130610150657-3xddn91gm0iq0ubp
bzr revid: nicolas.vanhoren@openerp.com-20130610154514-oee6s4f9g17bx63z
2013-06-10 17:45:14 +02:00
niv-openerp 9b1904e892 Put back stuff removed by merge
bzr revid: nicolas.vanhoren@openerp.com-20130607103749-7pe6k3vgwudohnxo
2013-06-07 12:37:49 +02:00
niv-openerp b778d3c45a merge trunk
bzr revid: nicolas.vanhoren@openerp.com-20130607085618-quxxm6izqlfnoy1n
2013-06-07 10:56:18 +02:00
niv-openerp 3d782a25d9 fix stupid bug
bzr revid: nicolas.vanhoren@openerp.com-20130606164726-zdwd4rf93m7unt35
2013-06-06 18:47:26 +02:00
niv-openerp a3e430ec63 Changed to use werkzeug's LocalStack
bzr revid: nicolas.vanhoren@openerp.com-20130606162020-oemq8eyuxr47a2e1
2013-06-06 18:20:20 +02:00
niv-openerp 12e3ce123f detail
bzr revid: nicolas.vanhoren@openerp.com-20130605093915-kmwtw7cq578lb230
2013-06-05 11:39:15 +02:00
niv-openerp 6afbca24f9 [REV] revert of previous improvement
bzr revid: nicolas.vanhoren@openerp.com-20130605092926-dhoumh76dwtl211t
2013-06-05 11:29:26 +02:00
niv-openerp 7f44a2ea6e Added request in the list of first arguments for methods to wrap
bzr revid: nicolas.vanhoren@openerp.com-20130605084221-zyi54wa4ci36e2dd
2013-06-05 10:42:21 +02:00
niv-openerp b466818a89 (At least) managed to put the magic patcher for all methods that get a "req" object
bzr revid: nicolas.vanhoren@openerp.com-20130604151631-tfqvcoq3kd4e16ey
2013-06-04 17:16:31 +02:00
niv-openerp 01c6623a9b Puts the request in a thread-local stack
bzr revid: nicolas.vanhoren@openerp.com-20130604133450-j7mhtn2r9wbur5o7
2013-06-04 15:34:50 +02:00
Mohammed Shekha 22ba680c7e [FIX]Refixed the issue of oe_sessions_effectiveusername storage in temp, used geteuid which returns effective user id.
bzr revid: msh@openerp.com-20130530090814-6uf0hs5j0223w985
2013-05-30 14:38:14 +05:30
Christophe Simonis 98710901f1 [FIX] web: do not wrap HTTPExceptions inside errors 500
[FIX] web: return a httpcode 204 when controller do not return anything

bzr revid: chs@openerp.com-20130524145456-rh17iax17g8cgvma
2013-05-24 16:54:56 +02:00
Mohammed Shekha 0dc578fc9c [FIX]Fixed the issue of session storage directory created with wrong username when someone restart the server using sudo.
bzr revid: msh@openerp.com-20130521105206-8oka7n7t9z13uiwo
2013-05-21 16:22:06 +05:30
Fabien Meghazi 609602c62c [FIX] Backport of Revision: 3736 revid:xmo@openerp.com-20130507081611-t2bfba2ai79xj1ew
bzr revid: fme@openerp.com-20130508174456-vy83gd527hin141q
2013-05-08 19:44:56 +02:00
Fabien Meghazi 0fc63fdf80 [FIX] registry_cr helper
bzr revid: fme@openerp.com-20130508131308-zafco4lvrmou3203
2013-05-08 15:13:08 +02:00
Fabien Meghazi 083d5ef6e5 [MERGE] Backport of Revision: 3728 revid:nicolas.vanhoren@openerp.com-20130502095055-xq9hna23otx65aq4
bzr revid: fme@openerp.com-20130508131019-hwz8wjud89sizbn0
2013-05-08 15:10:19 +02:00
Antony Lesuisse 4c579fe55e [IMP] request add registry_cr helper
bzr revid: al@openerp.com-20130507182521-seuuzkd6uvuxc9xo
2013-05-07 20:25:21 +02:00
Xavier Morel 7743760a4f [FIX] case where Root's dispatcher finds a non-exposed method
Using elif, if a method was found but not exposed (because
internal/whatever) the controller's index method would be skipped
during URL dispatch leading to a 404.

Since matched method yields an early return, a simple if will work,
and will *not* skip case where ``method and not method.exposed``

bzr revid: xmo@openerp.com-20130507081611-t2bfba2ai79xj1ew
2013-05-07 10:16:11 +02:00
Antony Lesuisse 3baa897ec2 [REV] transactions on controllers
bzr revid: al@openerp.com-20130506112938-g9hck0xbwfb817r5
2013-05-06 13:29:38 +02:00
niv-openerp ff15c4ce7f [IMP] Added new api to handle transactions in controllers
bzr revid: nicolas.vanhoren@openerp.com-20130506102955-x28gmm3rx8i6j345
2013-05-06 12:29:55 +02:00
Olivier Dony 6c3b3ea380 [MERGE] Forward-port of 7.0 bugfixes, up to rev. 3915
revision-id: odo@openerp.com-20130503102248-vjl1b8xju9uwfq97

bzr revid: odo@openerp.com-20130503102451-nynkrrpldrafyv3i
2013-05-03 12:24:51 +02:00
Fabien Meghazi 31c3555f94 [FIX] force module paths to be bytestrings
Backport trunk Revision:
3729 revid:chm@openerp.com-20130502122806-1i9h8v0cvhb6p63q


The http controllers handler crashes when there are non-ascii chars in the url path.

`openerp.modules.module.ad_paths` containing unicode strings, werkzeug fail to compare the path `module` which is converted to ascii.
force `module` to be bytestrings

bzr revid: fme@openerp.com-20130502123657-f2sg50fq3216lh7d
2013-05-02 14:36:57 +02:00
Christophe Matthieu a31af55ef5 [MERGE] force module paths to be bytestrings
The http controllers handler crashes when there are non-ascii chars in the url path.

`openerp.modules.module.ad_paths` containing unicode strings, werkzeug fail to compare the path `module` which is converted to ascii.
force `module` to be bytestrings

bzr revid: chm@openerp.com-20130502122806-1i9h8v0cvhb6p63q
2013-05-02 14:28:06 +02:00
Christophe Matthieu 47d8e1a470 [FIX] http.py
Impossible to load the website when there is a unicode char in the url path.

`openerp.modules.module.ad_paths` containing unicode strings, werkzeug fail to compare the path which is converted to ascii.
force `openerp.modules.module.ad_paths` to only contain bytestrings

bzr revid: chm@openerp.com-20130502104249-ttokukc2rpetxqkr
2013-05-02 12:42:49 +02:00
niv-openerp 5e0437226e [IMP] allow definition of web controllers that match all sub-urls
bzr revid: nicolas.vanhoren@openerp.com-20130502095055-xq9hna23otx65aq4
2013-05-02 11:50:55 +02:00
Olivier Dony ba5710962e [MERGE] Forward-port of 7.0 bugfixes, up to rev. 3912
revision-id: nicolas.vanhoren@openerp.com-20130430094843-9m1629m517vjtm1o

bzr revid: xmo@openerp.com-20130424102025-w33zyopm96r7q09p
bzr revid: odo@openerp.com-20130430103337-i9wuj8zf3h41h1ay
2013-04-30 12:33:37 +02:00
Antony Lesuisse 44569c06a2 [FIX] http controllers inheritance
minimalist and backward compatible implementation

bzr revid: al@openerp.com-20130423210644-hmvglhh10zlrwp9q
2013-04-23 23:06:44 +02:00
Christophe Simonis e5736828f9 [REVERT] revert commit fme@openerp.com-20130418171750-7oldgiewo1eewxk7: do not break stable API !!!
bzr revid: chs@openerp.com-20130423124151-h025b891xp77flg3
2013-04-23 14:41:51 +02:00
niv-openerp e29c8b4d91 [FIX] possible race condition when creating the session file for the web server
lp bug: https://launchpad.net/bugs/1157102 fixed

bzr revid: nicolas.vanhoren@openerp.com-20130422082952-yldmbmmx2rhol2pw
2013-04-22 10:29:52 +02:00
Xavier Morel 3da2aaf488 [IMP] only use name of class being created: module is incorrect for dynamically created classes
bzr revid: xmo@openerp.com-20130418094315-qk8m13s4zzvojauw
2013-04-18 11:43:15 +02:00
Xavier Morel db4d08e3a9 [FIX] Extension of controller in-place with explicit spec of same _cp_path
When extending a controller in-place (e.g. A(Controller), B(A)) and
providing the exact same _cp_path as parent (no-op) execution path
would go into handler for _cp_path overwriting and raise an assertion
error for overwriting of existing controller.

Except this is allowed (if ugly) pattern, so warn & ignore behavior
(it is harmless).

bzr revid: xmo@openerp.com-20130418092405-wrmmrd648b9koefu
2013-04-18 11:24:05 +02:00
Xavier Morel 1f421e7928 [FIX] redefinition and in-place extension scenarios for controllers
bzr revid: xmo@openerp.com-20130402143217-pfe2288iodw9r81g
2013-04-02 16:32:17 +02:00
Alexandre Fayolle 30073a2e8f [FIX] race condition in session directory creation
try to create the directory and handle the possible exception instead of doing
an unsafe 2 step check and creation. 

The issues related to the naming of the directory mentionned in the bug report
are not handled.

lp bug: https://launchpad.net/bugs/1157102 fixed

bzr revid: alexandre.fayolle@camptocamp.com-20130319102008-omtaka8dtq9v7m1l
2013-03-19 11:20:08 +01:00
Olivier Dony a451cacb91 [MERGE] http.WebRequest: clear db/uid tracking on worker thread to avoid incorrect values during logging
Could happen when a worker thread is reused for another
database but does not go through all the dispatching levels,
e.g. for static resources served by werkzeug itself.

bzr revid: odo@openerp.com-20130301171616-joit5dvjx51ums1y
2013-03-01 18:16:16 +01:00
Olivier Dony ef10c2e3c8 [FIX] http.WebRequest: clear db/uid tracking on worker thread to avoid incorrect values during logging
Could happen when a worker thread is reused for another
database but does not go through all the dispatching levels,
e.g. for static resources served by werkzeug itself.

bzr revid: odo@openerp.com-20130228173530-bs5pun9o09iobosi
2013-02-28 18:35:30 +01:00
Xavier Morel 94c2c42be6 [MERGE] from 7.0
bzr revid: xmo@openerp.com-20130313094909-u21ee88l2lak9p2x
2013-03-13 10:49:09 +01:00
niv-openerp 451c85c52a [FIX] problem with error reporting in http requests
bzr revid: nicolas.vanhoren@openerp.com-20130205105017-hr8c24c3dnxqabd7
2013-02-05 11:50:17 +01:00
niv-openerp 65cfe2ee38 Removed old useless keys
bzr revid: nicolas.vanhoren@openerp.com-20130130152926-bhdxho0eyq58s3or
2013-01-30 16:29:26 +01:00
niv-openerp 4776ea75eb Solved warning problem
bzr revid: nicolas.vanhoren@openerp.com-20130130152552-l07fk2lahfnb9ckx
2013-01-30 16:25:52 +01:00
niv-openerp 79f7eaf08c Changed exception handling in jsonrpc
bzr revid: nicolas.vanhoren@openerp.com-20130130143049-hofmnixydlf42dds
2013-01-30 15:30:49 +01:00
Antony Lesuisse 7826bd85f8 [MERGE] trunk
bzr revid: al@openerp.com-20121219025047-og0v9r8x09y0wmd3
2012-12-19 03:50:47 +01:00
Antony Lesuisse 3e1bce4bad minor fixes
bzr revid: al@openerp.com-20121219024946-6ezbvcizf09w8lio
2012-12-19 03:49:46 +01:00
Fabien Meghazi 78b92eace8 [FIX] Defaults user's context.lang to 'en_US'
bzr revid: fme@openerp.com-20121217100127-i7hr6klay251jo39
2012-12-17 11:01:27 +01:00
Vo Minh Thu 3e6c62d472 [IMP] web.http: _load_addons load the addons in a reproducible way.
I believe there are potential circular imports that can break
because of openerp.modules.module ImportHook, but they are
deifficult to reproduce when the import order is not always
the same.

bzr revid: vmt@openerp.com-20121210140411-ranw3jc3mwu3ymty
2012-12-10 15:04:11 +01:00
Christophe Simonis da574605c7 merge upstream
bzr revid: chs@openerp.com-20121129145039-mzj8b1vpdu48budl
2012-11-29 15:50:39 +01:00
Xavier Morel 4a5cb1ebc4 [REM] EVALPOCALYPSE PART 2: no more python-side eval
trigger an error if a nonliteral context is pushed to the server (through a new object_hook)

bzr revid: xmo@openerp.com-20121126140525-ni2x5m56upss610b
2012-11-26 15:05:25 +01:00
Xavier Morel eb9a1c7d55 [REM] EVALPOCALYPSE PART ONE
bzr revid: xmo@openerp.com-20121126105450-0f6xowd3dhj4jmbl
2012-11-26 11:54:50 +01:00
Christophe Simonis 4aa5e76174 merge upstream
bzr revid: chs@openerp.com-20121116183212-1ke59kde4ilicw6d
2012-11-16 19:32:12 +01:00