Commit Graph

158 Commits

Author SHA1 Message Date
Olivier Dony f15cbd6520 [MERGE] Forward-port saas-4 bugfixes up to ad4c6ca 2014-06-12 18:54:36 +02:00
Olivier Dony 6b85d80f23 [FIX] Wrap werkzeug.utils.escape() to accomodate signature change in 0.9
We always want to escape quotes (") as part of the process of
generating HTML output. This option (quote=True) turned into
an implicit flag with a DeprecationWarning in werkzeug 0.9.0
It is likely to disappear in a future release of werkzeug too.
A wrapper avoids this warning without loss of compatibility
2014-06-10 18:46:40 +02:00
Olivier Dony 04211015fc [MERGE] Forward-port of latest saas-4 fixes, up to 0452851 2014-05-27 20:49:49 +02:00
Xavier Morel 327dda0bde [FIX] correctly handle invalid max_width/max_height passed to website._image 2014-05-23 15:11:13 +02:00
Christophe Simonis a756b82372 [MERGE] forward port of branch saas-4 up to revid bb26dea 2014-05-20 20:19:55 +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 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 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 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 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
Antony Lesuisse 56eeefdfda [MERGE] trunk-websit-al-refactor by chm
- allow fiscal position change on sale orders
- public user on website
- simplify website_sale sale.order and shopping cart code
- remove preprocess_request

bzr revid: al@openerp.com-20140507153223-q73u5lhyrfw98o3a
2014-05-07 17:32:23 +02:00
Fabien Meghazi cf8cf4f255 [REM] preprocess_request from website
The method is still there with only a pass statement
Will completetly remove once chm merges his branch

bzr revid: fme@openerp.com-20140505163841-lstk3r37sf23ngrg
2014-05-05 18:38:41 +02:00
chm@openerp.com ee16b014b1 [MERGE] from trunk
bzr revid: chm@openerp.com-20140502095132-kfx40xou73mukr2y
2014-05-02 11:51:32 +02:00
Fabien Pinckaers 1dd63bce78 [IMP] website images: allow no max_width (default), faster loading if no resize
bzr revid: fp@tinyerp.com-20140501114003-5xs31o0lzpp8ru2s
2014-05-01 13:40:03 +02:00
chm@openerp.com 13469c23d8 [MERGE] from trunk
bzr revid: chm@openerp.com-20140424135841-akc01inl26fcirwy
2014-04-24 15:58:41 +02:00
Fabien Meghazi 1d8400418e [MERGE] upstream
bzr revid: fme@openerp.com-20140423123744-zfz7k8drn2t624zu
2014-04-23 14:37:44 +02:00
Fabien Meghazi c117c3e10f [MOV] website: translatable context var from website#preprocess_request to ir.ui.view#render
bzr revid: fme@openerp.com-20140422134748-9niep8iyzx9ldq1l
2014-04-22 15:47:48 +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 7298130f31 [MERGE] from trunk
bzr revid: chm@openerp.com-20140410152925-ndajhnyh4rt8pkgu
2014-04-10 17:29:25 +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 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
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
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
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
chm@openerp.com 0bae967baa [MERGE] from trunk
bzr revid: chm@openerp.com-20140312154854-gtq7v1dxfnunkcz6
2014-03-12 16:48:54 +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
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
Fabien Meghazi 35a7182893 [MERGE] upstream
bzr revid: fme@openerp.com-20140225104654-d1ni7z5t8w0qc7mw
2014-02-25 11:46:54 +01:00
Christophe Matthieu 1d4f8783b5 [IMP] website_sale: some fix and imp
bzr revid: chm@openerp.com-20140221172816-5bb5l9z2xsvswz8u
2014-02-21 18:28:16 +01:00
Christophe Matthieu 758aa20c75 [MERGE] from trunk
bzr revid: chm@openerp.com-20140221112742-nq2g1l3emoa2q9cz
2014-02-21 12:27:42 +01:00
Christophe Matthieu bfeb2b9631 [MERGE] from trunk
bzr revid: chm@openerp.com-20140221094343-s1oh3iq07zi2jo0x
2014-02-21 10:43:43 +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
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
Antony Lesuisse 87172d90d2 [MERGE] saas-3
bzr revid: al@openerp.com-20140209140315-ukqlf90ngy6ycu2k
2014-02-09 15:03:15 +01:00
Christophe Simonis daace48560 [MERGE] fix template rendering
bzr revid: chs@openerp.com-20140206163811-i43srg7hd4yqzzo3
2014-02-06 17:38:11 +01:00