Commit Graph

2200 Commits

Author SHA1 Message Date
Xavier Morel e06f5b414b [IMP] inherit_option_id -> application 2014-05-27 12:13:51 +02:00
Xavier Morel d67161b649 [IMP] renamed some stuff for clarity 2014-05-27 11:57:06 +02:00
Xavier Morel 80c7b6defc [IMP] dict(int: True) -> set(int) 2014-05-27 11:57:06 +02:00
Xavier Morel da4441246e [IMP] use set to collect inherit_id and inherit_option_id
Also add a few comments to note understanding of code
2014-05-27 11:57:05 +02:00
Xavier Morel b5cce44dd2 [IMP] use sets to check for groups/ACL
rco notes that group tests are generally intersections, if the user has *any*
group set on the object he can see/use it. This change is a literal
translation of the original semantics, which may be wrong.
2014-05-27 11:57:05 +02:00
Xavier Morel 4e3864c1fb [IMP] no need to ensure an actual context if the method does not use it
just forwarding the context object does not count as using it, if callees want
a context they can ensure they've got one on their own
2014-05-27 11:57:04 +02:00
Xavier Morel 85c466611a [IMP] don't pointlessly recreate view_obj every time _views_get is called, better use of pool & data APIs 2014-05-27 11:57:04 +02:00
Xavier Morel ad33728043 [IMP] use sorted + key instead of sort + cmp 2014-05-27 11:57:03 +02:00
Xavier Morel 3d91b2dfa2 [REM] unused stack_result parameter 2014-05-27 11:57:03 +02:00
Fabien Meghazi 5cc1317a5f [FIX] sitemap.xml urls 2014-05-26 14:58:30 +02:00
--global 62c0f6bf11 [FIX] website: ir_http: when rerouting url containing default language -> url without language, the ? was missing, leading to wrong urls. 2014-05-23 10:39:26 +02:00
--global 319f4cb270 [FIX] website: define languages variable outside of an 'if' as it is used below in the same template, leading to a crash due to the variable not always being defined. 2014-05-23 10:23:13 +02:00
Fabien Meghazi 593cdf427f Merge remote-tracking branch 'odoo/master' into master-seperate-bundle-fme 2014-05-21 10:29:04 +02:00
Christophe Simonis a756b82372 [MERGE] forward port of branch saas-4 up to revid bb26dea 2014-05-20 20:19:55 +02:00
Christophe Simonis 040c93026a [MERGE] merge bzr trunk addons branch 2014-05-20 18:10:36 +02:00
Fabien Meghazi 863edbaaf2 Seperate assets_common from other bundles 2014-05-20 17:06:25 +02:00
Fabien Meghazi 59bfda8efd Slug redirects loses query_string 2014-05-20 10:25:39 +02:00
Fabien Meghazi 42d8a90afd [IMP] minor changes to sitemap 2014-05-19 13:59:38 +02:00
Fabien Meghazi 2df2da6514 [FIX] properly set website_multilang attribute 2014-05-19 12:33:47 +02:00
Fabien Meghazi f90a37ea70 [IMP] sitemap caches it's output in ir.attachment 2014-05-16 15:31:26 +02:00
Fabien Meghazi e27c1b91f9 [MERGE] upstream 2014-05-16 15:31:11 +02:00
rim-odoo d3beae2921 [FIX] website: make sure the hidden properties on website will not be overwritten by other properties 2014-05-16 12:19:32 +02:00
Fabien Meghazi 3d881b1a0c [REM] debuggin stuff 2014-05-15 17:26:37 +02:00
Fabien Meghazi 828b7aef2f [WIP] sitemap 2014-05-15 16:58:16 +02:00
Fabien Meghazi cada6437d5 [REM] temporary disable sitemap 2014-05-15 10:25:18 +02:00
Fabien Meghazi 2e0e242c82 [REV] Revert lazy sitemap 2014-05-14 17:11:16 +02:00
Olivier Dony 6130ed3ce0 [IMP] website: refactor website_image controller (and placeholder), move to model to make it reusable
It is "almost" reusable because it still depends on the global `request` variable,
this could be solved by making it an explicit parameter.
2014-05-14 16:32:36 +02:00
Fabien Meghazi a20ccfc7d4 [FIX] lazy sitemap with generators 2014-05-14 15:48:51 +02:00
Xavier Morel f4d78ae738 Merge branch 'server-trunk'
Conflicts:
	addons/mass_mailing/controllers/main.py
2014-05-14 15:13:04 +02:00
Fabien Meghazi e6e5ac048b [FIX] broken routes for pages 2014-05-14 12:11:24 +02:00
Fabien Meghazi c3cfc4bc32 [MERGE] sitemap backport, merge trunk from 9438 til 9440
merge from 9438 revid:fp@tinyerp.com-20140511115231-g8ke14r9iepyypv4 til 9440 revid:fp@tinyerp.com-20140511143314-nzn1239l00arbxjq
2014-05-13 16:38:31 +02:00
Fabien Meghazi 119823ab84 [IMP] Redirect to language-less url on default language 2014-05-13 12:07:29 +02:00
Fabien Meghazi c73a2f1c57 [FIX] restore request.website_multilang for templates 2014-05-13 12:07:20 +02:00
Fabien Meghazi 8eed143112 [IMP] Invert multilang logic in route decorator. True by default, can be set to False explicitlty 2014-05-13 11:35:45 +02:00
Fabien Meghazi 4118f9ed0a [IMP] openerpframework moved in common asset bundle 2014-05-13 10:18:31 +02:00
Xavier Morel 023aa7acdf [FIX] website_forum links which should not be, post-install crawler
* move URLs of purely-JS-hook <a> to data-href so the crawler does not try to
  access them (they're JSON-RPC endpoints...)
* replace side-effecting links (...) by styled buttons
* fix crawler to not take fragments in account when deduplicating and
  navigating URLs
2014-05-12 18:34:55 +02:00
Fabien Meghazi 1d08697bc1 [FIX] Do not display language choice if multilang=False 2014-05-12 17:42:01 +02:00
Fabien Meghazi 4a29752451 [IMP] openerpframework moved in common asset bundle 2014-05-12 17:19:34 +02:00
Fabien Meghazi 05c598f0b3 [ADD] website.menu editable list in website config
bzr revid: fme@openerp.com-20140512113820-oidhod8ovqp3nh9a
2014-05-12 13:38:20 +02:00
Martin Trigaux 555d4879c8 Forward-port of latest saas-4, up to revision 9416 (rev-id fme@openerp.com-20140509164338-gnz7p3qxt8etrh5w)
bzr revid: mat@openerp.com-20140512072331-0lidgqb6x7fregdj
2014-05-12 09:23:31 +02:00
Fabien Pinckaers 106abb6496 [FIX] css edit menu alignment and fix of / handling
bzr revid: fp@tinyerp.com-20140511154058-kj8nn9fdl3li9nzi
2014-05-11 17:40:58 +02:00
Fabien Pinckaers cebce64b00 [FIX] better handling of '/'. / is the first menu and not the first menu is /. Allows to move the first menu in another position
bzr revid: fp@tinyerp.com-20140511153235-6mmygt69z45rcx4r
2014-05-11 17:32:35 +02:00
Fabien Pinckaers 105618443f [IMP] Sitemap
bzr revid: fp@tinyerp.com-20140511134037-84vnn1b4zfzk8som
2014-05-11 15:40:37 +02:00
Fabien Pinckaers 54d30d5194 [IMP] clean sitemap, enumerate pages + fixes
bzr revid: fp@tinyerp.com-20140511115231-g8ke14r9iepyypv4
2014-05-11 13:52:31 +02:00
Fabien Meghazi 501ad7abeb [IMP] dumb code
bzr revid: fme@openerp.com-20140509151855-7v4hp08qvmac1u2d
2014-05-09 17:18:55 +02:00
Fabien Meghazi 7caabb8f75 [MERGE] upsteam
bzr revid: fme@openerp.com-20140509144608-btah4s8zorzon2jo
2014-05-09 16:46:08 +02:00
Fabien Meghazi 69a93b07c7 [MOV] ir.ui.view#write() forced noupdate moved in `website` (RTE only)
bzr revid: fme@openerp.com-20140509141024-xa9mawoye3o8e6c1
2014-05-09 16:10:24 +02:00
Fabien Meghazi 4c24985289 [ADD] alternate hreflang links in head for search engines
cf: https://support.google.com/webmasters/answer/189077?hl=en

bzr revid: fme@openerp.com-20140509122400-49sl631mwipx1039
2014-05-09 14:24:00 +02:00
Fabien Meghazi f652660cb6 [FIX] is_multilang_url by checking against werkzeug's routing map using query string too
bzr revid: fme@openerp.com-20140509122323-2ext0livjgr5njb0
2014-05-09 14:23:23 +02:00
Fabien Meghazi 95e1bd0612 [REM] completetly removed website#preprocess_request()
bzr revid: fme@openerp.com-20140507170816-rrnh1nlqf97pfy3k
2014-05-07 19:08:16 +02:00