Commit Graph
244 Commits
Author SHA1 Message Date
Olivier Dony 3ad6d69b21 [FIX] website: avoid using werkzeug API only present in 0.9+
bzr revid: odo@openerp.com-20140424131415-ot0r5062wndvuicr
2014-04-24 15:14:15 +02:00
chm@openerp.com aaa3265f47 [MERGE] from trunk
bzr revid: chm@openerp.com-20140411081401-0ybuuboo6f3b58kv
2014-04-11 10:14:01 +02:00
chm@openerp.com 4dc3b139f3 [IMP] ir_qweb, ir_ui_view: can use id insead of xml_id; can render ir.ui.view many2one with widget='qweb' in template
bzr revid: chm@openerp.com-20140409104427-ut3r5acavyjsp6bj
2014-04-09 12:44:27 +02:00
chm@openerp.com d2407ec8c4 [MERGE] from trunk
bzr revid: chm@openerp.com-20140408154556-e4ud0kzyfcm13iui
2014-04-08 17:45:56 +02:00
chm@openerp.com 673dc5b1d7 [MERGE] from trunk
bzr revid: chm@openerp.com-20140408132412-7ofhd87laj3uoazj
2014-04-08 15:24:12 +02:00
Simon Lejeune 4983f86d81 [MERGE] trunk
bzr revid: sle@openerp.com-20140407174534-pk6b5lozvik78fom
2014-04-07 19:45:34 +02:00
Christophe Simonis 0fad8159f3 [MERGE] forward port of branch saas-3 up to revid 9380 chs@openerp.com-20140407144439-10n8fs6zovodwwtx
bzr revid: chs@openerp.com-20140407163318-hh3jwfkj3o2c83lk
2014-04-07 18:33:18 +02:00
chm@openerp.com ee4b879536 [IMP] website: media editor: insert add button for image loader and fix try_remove don't remove image
bzr revid: chm@openerp.com-20140407074922-zri6j4u9sw52nkkw
2014-04-07 09:49:22 +02:00
Simon Lejeune 8bf8e8a01c [FIX] website ir_qweb: do not crash if request is not bound when rendering a template
bzr revid: sle@openerp.com-20140402161349-ecm6pit20j44taf1
2014-04-02 18:13:49 +02:00
Olivier Dony f120d6ffb7 [FIX] ir.qweb: avoid errors with function fields of type datetime
bzr revid: odo@openerp.com-20140401160623-loj5nsph7tfnn1us
2014-04-01 18:06:23 +02:00
Fabien Meghazi b7fbef1241 [FIX] Serve ir.attachment with SUPERUSER_ID
We are not supposed to have a user id here

bzr revid: fme@openerp.com-20140326184022-1hulv7t5y6vuvr9y
2014-03-26 19:40:22 +01:00
Fabien Meghazi eb5cbea318 [MERGE] upstream
bzr revid: fme@openerp.com-20140326152433-vegu5tuvr8vc1s8v
2014-03-26 16:24:33 +01:00
Fabien Meghazi 0fe55dddc1 [IMP] Added a mimetype field in ir.attachment
bzr revid: fme@openerp.com-20140325160413-jvxjii6rbqcrjxor
2014-03-25 17:04:13 +01:00
chm@openerp.com 0d4d9af5f4 [FIX] website: fix and activate frontend test
bzr revid: chm@openerp.com-20140325140328-3f5is66d0petqrl6
2014-03-25 15:03:28 +01:00
Fabien Meghazi 329c19f94e [FIX] Fix url slug check bug in multilang=True
bzr revid: fme@openerp.com-20140325140026-0qdx9zl21za8gto9
2014-03-25 15:00:26 +01:00
Fabien Meghazi 8435da41bc [MERGE] upstream
bzr revid: fme@openerp.com-20140325103928-ja3bqy6xmyp91gva
2014-03-25 11:39:28 +01:00
Fabien Meghazi 27f38edb25 [FIX] dirty saas-3 fix for url lang switching with model converters
bzr revid: fme@openerp.com-20140325100722-temaci88fowcr2m5
2014-03-25 11:07:22 +01:00
chm@openerp.com 13d7cfe86c [MERGE] from trunk
bzr revid: chm@openerp.com-20140324082341-d6gqyloc7822aen2
bzr revid: chm@openerp.com-20140325084852-i1yomuyhyen4ss95
2014-03-25 09:48:52 +01:00
Simon Lejeune 9556cadbff [MERGE] trunk
bzr revid: sle@openerp.com-20140324162043-dzdwcxdt32sfjy57
2014-03-24 17:20:43 +01:00
Fabien Meghazi bb8b7ea2d9 [ADD] website ir_http: serve binary ir.attchments with urls
bzr revid: fme@openerp.com-20140324151728-hpegewvf3b38ndyi
2014-03-24 16:17:28 +01:00
Fabien Meghazi 9285813da9 [IMP] website images: only checksum ir.attachment for empty urls
bzr revid: fme@openerp.com-20140324151447-a3mkncjh0b7k16hg
2014-03-24 16:14:47 +01:00
Simon Lejeune 50fda546e2 [REF] Moved qweb contact from website to base and removed the from_html method (it never worked)
bzr revid: sle@openerp.com-20140324135933-f21heo0sz0tzjbv3
2014-03-24 14:59:33 +01:00
Christophe Simonis d93b79e6f4 [MERGE] forward port of branch saas-3 up to revid 9345 dle@openerp.com-20140324110349-e82t1bmmtjqbl85k
bzr revid: chs@openerp.com-20140324133811-4az1kvbznd26seow
2014-03-24 14:38:11 +01:00
Simon Lejeune 6b5986e34d [FIX] ir_http website postprocess args: do not redirect if the only difference between the url and the post-processed url is the url-enconding of some characters
bzr revid: sle@openerp.com-20140321120133-0k1zjsrtgwrw6oon
2014-03-21 13:01:33 +01:00
Xavier Morel a56dc53bea [REM] 4-spaces indent for web view pretty-print-before-save routine
Didn't quite work right: on the layout, it would exponentially increase
leading spaces in text nodes. Combined with a bug injecting snippets marks in
the footer (and thus invalidating and re-saving the layout at each snippet
addition) this could blow up the layout template and rendered page to >20MB.

Just keep lxml's standard 2-spaces indent.

LXML is unable to pretty print the layout anyway.

bzr revid: xmo@openerp.com-20140321075419-9w88h232r928xv5f
2014-03-21 08:54:19 +01:00
chm@openerp.com abe8e7208e [MERGE] from trunk
bzr revid: chm@openerp.com-20140318102102-ug0ny6q360i4o1e6
2014-03-18 11:21:02 +01:00
Xavier Morel 8ffc4d0a5a [ADD] support for presized fields in website/image
also add presized field to attachments (automatically computed from datas)

bzr revid: xmo@openerp.com-20140317104251-ddsa9cfpq1vkk2k1
2014-03-17 11:42:51 +01:00
Fabien Pinckaers d5c63e3205 [MERGE] trunk
bzr revid: fp@tinyerp.com-20140316122101-angijeo5fmr5j8v7
2014-03-16 13:21:01 +01:00
Fabien Pinckaers 675a71b2b8 [IMP] attachments on messages
bzr revid: fp@tinyerp.com-20140316113742-odae0ph3a1qrqn12
2014-03-16 12:37:42 +01:00
chm@openerp.com 353bbdc2c3 [FIX] website: route and redirect: remove all backslash from url
bzr revid: chm@openerp.com-20140314162346-25vohj6ayp65tgiy
2014-03-14 17:23:46 +01:00
Fabien Meghazi b4ffbb4b35 [FIX] website#ir.http: do not postprocess arguments on non website_enabled endpoints
bzr revid: fme@openerp.com-20140312143539-bzf54zlzeawqkfuo
2014-03-12 15:35:39 +01:00
Christophe Simonis d504764eff [MERGE] forward port of branch saas-3 up to revid 9298 chm@openerp.com-20140311130852-3ft0v1mc9ht1any6
bzr revid: chs@openerp.com-20140311145205-s56fj113fsrnisc3
2014-03-11 15:52:05 +01:00
Fabien Meghazi 5e036bbf7c [FIX] Properly redirect in case of invalid url slugs
Use werkzeug's api instead of doing hackish url replacement

bzr revid: fme@openerp.com-20140310130530-e86cdwhdca9cs9g3
2014-03-10 14:05:30 +01:00
Xavier Morel 8ab5f3979b [ADD] deduplication of website images being uploaded
There is a deduplication in ir.attachment, but it's only for FS-stored content
*and* it only deduplicates storage not models (as there are access rights
issues involved).
  
The goal here is to always return the same attachment when a user uploads the
exact same image multiple times (because it's simpler or whatever).
  
Initially tried to use a binary field & digest(), but search() blows up
because it tries to utf-8 encode raw binary data. So use char & hexdigest
instead.
  
_compute_checksum returns None if the provided attachment data does not look
like a website image attachment.
  
Unhandled: multiple existing matches, maybe a UNIQUE constraint on the
checksum field would be a good idea just in case.

cherrypicked from saas-3's xmo@openerp.com-20140303153855-5f2l8v0jq2mgb26f
which had to be backed out (as the patch adds a new stored field)

bzr revid: xmo@openerp.com-20140304133117-r88p9zl2tc9tsh75
2014-03-04 14:31:17 +01:00
Xavier Morel a0feb7c3c9 [REV] backout xmo@openerp.com-20140303153855-5f2l8v0jq2mgb26f, schemas should not be altered in saas-3
bzr revid: xmo@openerp.com-20140304132101-qysq310wp1oo859n
2014-03-04 14:21:01 +01:00
Xavier Morel e78a3b18cc [ADD] tentative removal of attachments
Attachments ought be removed only if they are not used in an existing page/web
view.

Theoretically this could be set directly in unlink(), but:
* that would make a nice error message significantly harder
* the expenses of performing a text search in all view archs would be a bit expensive

Notes:
* the views set could be reduced to only "web" views
* the search is likely sensible to false negatives e.g. different order of
  query parameters. It *will* remove images still being used.

bzr revid: xmo@openerp.com-20140304110716-u14w6uo8fbkfa42i
2014-03-04 12:07:16 +01:00
Xavier Morel a99a15c960 [ADD] deduplication of website images being uploaded
There is a deduplication in ir.attachment, but it's only for FS-stored content
*and* it only deduplicates storage not models (as there are access rights
issues involved).

The goal here is to always return the same attachment when a user uploads the
exact same image multiple times (because it's simpler or whatever).

Initially tried to use a binary field & digest(), but search() blows up
because it tries to utf-8 encode raw binary data. So use char & hexdigest
instead.

_compute_checksum returns None if the provided attachment data does not look
like a website image attachment.

Unhandled: multiple existing matches, maybe a UNIQUE constraint on the
checksum field would be a good idea just in case.

bzr revid: xmo@openerp.com-20140303153855-5f2l8v0jq2mgb26f
2014-03-03 16:38:55 +01:00
Denis Ledoux 70d3570846 [FIX]website: do not send False value to google map api to retrieve the image. Otherwise, you are in the middle of the ocean.
bzr revid: dle@openerp.com-20140228170900-lagmopkmkb58exqr
2014-02-28 18:09:00 +01:00
Xavier Morel 6b857b6eeb [FIX] whitespace/indent lost by RTE
Didn't manage to find RTE settings to avoid losing leading whitespace of
lines, so reindeint arch after doing all integration, right before saving back
to view's field.

* html.fromstring(parser=HTMLParser(remove_blank_text=True) does not seem to
  work, so serialize to XML, and parse back with
  remove_blank_text. remove_blank_text necessary for lxml's pretty_print to
  work correctly.

* pretty_print only & always uses 2 spaces/indent level. Our files (and the
  HTML editor's Format button) uses 4 spaces -> need a second pass to double
  indents.

bzr revid: xmo@openerp.com-20140227125934-q8j3z440px2ic6kx
2014-02-27 13:59:34 +01:00
Denis Ledoux 50ecb598e7 [FIX] website: website settings should inherit of res.config.settings and not base.config.settings, as it create a new page settings, instead of extending one
bzr revid: dle@openerp.com-20140226171114-jwthykyud66l7o6x
2014-02-26 18:11:14 +01:00
Fabien Meghazi 35a7182893 [MERGE] upstream
bzr revid: fme@openerp.com-20140225104654-d1ni7z5t8w0qc7mw
2014-02-25 11:46:54 +01:00
Christophe Simonis 4b72678bc7 [MERGE] forward port of branch saas-2 up to revid 9195 chs@openerp.com-20140220154517-6y531n1mqtnfnsmr
bzr revid: chs@openerp.com-20140220163815-69sza1kclnh5mavs
2014-02-20 17:38:15 +01:00
Christophe Matthieu a09b0db51d [FIX] website: Select some text > Click on the link button > Select Page textfield and start typing (e.g. comm) > There is a lot of noise here; Dsiplaying create page for existing page
bzr revid: odo@openerp.com-20140219105502-jg8f2i1gpz5vdarf
2014-02-19 11:55:02 +01:00
Fabien Meghazi 6f670c58ce [REM] Removed lazy response usage
bzr revid: fme@openerp.com-20140219103032-5pc50taemkc6x0qo
2014-02-19 11:30:32 +01:00
Fabien Meghazi 375941932c [FIX] website's slug() should check if slugified string is empty
lp bug: https://launchpad.net/bugs/1271143 fixed

bzr revid: fme@openerp.com-20140217130755-ip1hccv9cxiscqf8
2014-02-17 14:07:55 +01:00
Olivier Dony 632182589c [IMP] website: extra safe check for qcontext's flag
bzr revid: odo@openerp.com-20140217093311-wmv6sxtv9aizusvr
2014-02-17 10:33:11 +01:00
Christophe Matthieu 386b2fe70f [IMP] website: add page: change default sequence and layout
bzr revid: chm@openerp.com-20140214103744-dptrytkfbcwti6t8
2014-02-14 11:37:44 +01:00
Christophe Matthieu ed785f0783 [FIX] website_sale: pager and breadcrum keep search and filter. Filter keep search and category. Links for category
bzr revid: chm@openerp.com-20140212115516-3izdv7cszgh2n3l4
2014-02-12 12:55:16 +01:00
Thibault Delavallée 19d9b7309d [CLEAN] website: ir_actions: removed commented line + small reordering of columns definition + fixed an help string
bzr revid: tde@openerp.com-20140212104227-bd2rsrewqizmxtf3
2014-02-12 11:42:27 +01:00
Thibault Delavallée e1e528e19c [MERGE] Sync with trunk
bzr revid: tde@openerp.com-20140212103823-aifj3y0dwir0cbyv
2014-02-12 11:38:23 +01:00