Commit Graph

2284 Commits

Author SHA1 Message Date
Antony Lesuisse 893aace122 [MERGE] website_sale optional-products 2014-06-26 12:31:15 +02:00
Olivier Dony 668b8c2b2d [FIX] Forward-port of saas-5 up to 0d330ca 2014-06-25 18:58:19 +02:00
Olivier Dony 0d330ca25c [MERGE] Forward-port of saas-4 up to fa739ac 2014-06-25 18:44:51 +02:00
Olivier Dony fa739ac8de [FIX] website: default mimetype for web-published attachments, avoids crash 2014-06-25 18:37:03 +02:00
Olivier Dony 4d488408b2 [MERGE] Forward-port of saas-3 up to 141e1b2 2014-06-25 18:34:03 +02:00
Jaydeep Barot 026e38b48f [REM] Unnecessary `size` parameters on char fields 2014-06-25 17:13:43 +02:00
Christophe Matthieu 77a07670cf [IMP] website: move custom scripts in the assets; fix website_sale_option to display modal in grid view 2014-06-25 14:03:23 +02:00
Jeremy Kersten 1a4bfa28c4 [FIX] Sitemap - Back forward from saas-5 5cc1317a5f to have the url_root in sitemap 2014-06-25 13:38:56 +02:00
Christophe Simonis 1eaa69d342 [MERGE] forward port of branch saas-5 up to 9e8e365 2014-06-25 12:44:13 +02:00
Christophe Simonis 9e8e3653f2 [MERGE] forward port of branch saas-4 up to f68c835 2014-06-25 12:43:41 +02:00
Fabien Meghazi f988d75035 [FIX] check after openerp's AccessErrors in website's _handle_exception 2014-06-25 12:20:40 +02:00
Christophe Matthieu f0ca6fbf75 merge upstream 2014-06-25 12:02:10 +02:00
Fabien Meghazi 4e0799e163 [FIX] _handle_exception() logic amongst requests and ir_http objects
Changes in website's ir_http#_handle_exception():

- exception is mandatory, can't be None anymore
- we don't touch non website_enabled requests
- we don't touch explicits plain responses from parent
- logic flow is now easier to read (I hope so)

Change in website's ir_http#_dispatch():

- In case of real 404, instead of returning self._handle_exception(),
  just let parent do the job (so we call super())
2014-06-25 11:47:44 +02:00
Christophe Simonis 5112421a93 [FIX] website: correct slug parsing 2014-06-25 11:08:51 +02:00
Christophe Matthieu 204a62499a [IMP] website_sale_options 2014-06-24 15:11:53 +02:00
Simon Lejeune 478a763cac [MERGE] manual merge of latest bootswatch minified stylesheets 2014-06-24 11:48:49 +02:00
Martin Trigaux caea4a9aec Merge pull request #621 from odoo-dev/saas-4-fix_actions_server_controller_return-vta
[FIX] website: controller for server actions should accept basic werkzeug requests (e.g. redirections)
2014-06-23 16:05:04 +02:00
Jeremy Kersten 2b44ac2cd6 [MERGE] Gengo - Merge saas-4-gengo-jke - Fix gengo to make it working 2014-06-23 12:22:25 +02:00
Christophe Matthieu bad13f0234 merge upstream 2014-06-23 10:07:56 +02:00
Jeremy Kersten 18bb52ee88 [FIX] Gengo - Update modoel ir_translation for gengo and make it working. Works with order and not job, because when you send a batch to translate, you don't know all the job but only the order. 2014-06-20 17:33:09 +02:00
Franck Bret b4afff3618 Unify website slugify method behavior with or without python-slugify, and add some unit tests 2014-06-20 11:25:44 +02:00
Christophe Matthieu 5165b52b43 merge upstream 2014-06-19 18:46:49 +02:00
Christophe Matthieu 2d686988a4 [FIX] tour.js: forgotten backdrop and orphan css 2014-06-19 17:52:32 +02:00
Christophe Simonis eef6330c55 [MERGE] forward port of branch saas-5 up to adf07a9 2014-06-19 16:23:32 +02:00
Christophe Simonis adf07a9490 [MERGE] forward port of branch saas-4 up to 5087612 2014-06-19 16:13:35 +02:00
Christophe Simonis 5087612d1d [MERGE] forward port of branch saas-3 up to bf53aed 2014-06-19 15:44:07 +02:00
Paramjit Singh Sahota 5023816c55 [FIX] website: correct selector
The selector to toggle the theme was triggered too often (on almost each button) but had no effect because no view-id was present.
Patch fix #627
2014-06-19 14:45:56 +02:00
Xavier Morel ab1406cd7c [FIX] website: ignore SVG elements when looking for edition events in RTE 2014-06-19 11:39:14 +02:00
Xavier Morel 56009e8804 [FIX] website: missing timezone conversion back to UTC
In t-field, datetime fields (formatted and not formatted versions) are
converted to the context/user's timezone (through
fields.datetime.context_timestamp) when displayed, but were saved without
converting back so the next display would go forward (or back) of the user's
tzoffset.

Fix that by applying context_timestamp's conversion backwards, from the
context/user's timezone back to UTC, before saving the field's value.
2014-06-18 16:09:02 +02:00
Christophe Matthieu 6ba14b38cb [FIX] website: geoip can't be none 2014-06-18 15:43:28 +02:00
Christophe Matthieu 890a9ac652 [IMP] website: set geoip in user session 2014-06-18 14:50:24 +02:00
FalcoBolger 97174a2a9d [FIX] Accept http responses as server action response 2014-06-18 13:39:30 +02:00
Christophe Matthieu bc3fc54fac [IMP] Tour: add tour in web module; tour became available in backend. 2014-06-18 12:25:13 +02:00
Thibault Delavallée 916a79184b Merge pull request #610 from odoo-dev/saas-5-mass-mailing-fixes-tde
[FIX] mass_mailing, website: fixed unsubscription link, fixed mobile preview of email designer crashing because of the redirection not taking search parameters
2014-06-18 11:52:04 +02:00
Thibault Delavallée 1de1b3c272 [FIX] website: mobile preview should keep the current search; some pages depends strongly of the url parameters, notably the email designer page. 2014-06-18 11:26:55 +02:00
xmo-odoo 3160eb74c4 Merge pull request #584 from xmo-odoo/master-qweb-groups-xmo
`@groups` attribute in qweb views
2014-06-18 09:37:02 +02:00
xmo-odoo 8482632c9b Merge pull request #354 from xmo-odoo/editor-xmlid
[IMP] add XID to view name in Ace editor dropdown
2014-06-17 16:24:04 +02:00
Xavier Morel 00c2644783 [IMP] display view's XID *below* the selection
* Looks better
* Allows for a label
* Allows for longer template names and ids without cutting off
* Room to grow more info bits
2014-06-17 16:22:28 +02:00
xmo-odoo c949509b5e Merge pull request #463 from xmo-odoo/qweb-foreach
Qweb foreach
2014-06-17 15:56:09 +02:00
xmo-odoo 0f72f6517d Merge pull request #525 from xmo-odoo/master-fix-website-postprocess-xmo
Fix postprocessing of request arguments in website
2014-06-17 15:55:55 +02:00
Denis Ledoux 3742b1ab3f [FIX] website: jquery attrbutes assignation is not supported by Firefox
Happens when trying to change an image in a a banner block
2014-06-17 15:43:56 +02:00
Richard Mathot cb3d38fa5c Merge pull request #561 from odoo-dev/master-branding-ref-rim
[REF] website: change URL to new Odoo website
2014-06-17 14:31:52 +02:00
Fabien Meghazi c4b1b58ffa [FIX] sitemap does not show pages
the /page/ controller was not using the ``page`` converter
2014-06-17 13:43:57 +02:00
Xavier Morel dda18249c0 [FIX] @groups attribute should not disappear when editing
The @groups attribute in qweb views was not rendered (even when matched by the
user), so editing a template with an @groups would either remove the whole
section (if the user didn't have the groups, fixed in previous commit) or only
removed the attribute itself making it visible to everybody (which ought be
fixed-ish by this commit).
2014-06-17 12:22:15 +02:00
Xavier Morel 79e10200d5 [IMP] prevent edition of page if groups which current user doesn't have
If the current view uses @groups attributes (possibly in called templates),
the corresponding elements are rendered to a void (empty string in qweb). If
said user can edit the page, does so and saves a view section in which there's
a @groups to which he has no access, the element[@groups] is completely
removed from the template once saved, losing it.

If QWeb encounters an @groups to which the current user has no right during
rendering, have it request a no-RTE page, so the user can not RTE-edit the
page (or drop snippets in it).
2014-06-17 12:01:52 +02:00
Richard Mathot ab3231d6c9 [REF] website: change URL to new Odoo website 2014-06-16 13:49:39 +02:00
Christophe Matthieu 3d66fff4d4 [FIX] website: clean for save of snippet editor don't remove conteneteditable attributes 2014-06-16 11:47:28 +02:00
Xavier Morel 1587663fd2 [FIX] postprocessing of request arguments in website
If website is installed but not used/enabled for the current controller,
overridden methods like _get_converters will *still run* for the controller's
dispatch.

This means a ModelConverter used in a controller with website installed but
not enabled will use website.models.ir_http.ModelConverter, not
base.ir.ir_http.ModelConverter, and base's args postprocessing will *not* be
able to convert the placeholder object to a real UID, only website's
postprocessing can do so.

And as far as I can see there's no reason to skip the URL building validation
either, only the multilang stuff relies on and requires that the controller be
website enabled (and in fact that it be multilang enabled), so only *that*
should be gated behind a flag.

Also always call super(), there's no reason not to and others might add args
to postprocess on base rather than website, ending up after website in the
MRO.
2014-06-13 16:11:56 +02:00
Olivier Dony 0f01df42ea [MERGE] Forward-port saas-5 up to f15cbd6 2014-06-12 18:59:15 +02:00
Olivier Dony f15cbd6520 [MERGE] Forward-port saas-4 bugfixes up to ad4c6ca 2014-06-12 18:54:36 +02:00