pengyuthon/odoo_source
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
94,043 Commits 1 Branch 0 Tags
e332b2bb202ddfbc7427c54dd369ec12bbbfc2e2
Commit Graph
2665 Commits
Author SHA1 Message Date
Olivier Dony 0c483d3f43 [FIX] typos in last forward-port 2015-02-24 15:50:13 +01:00
Olivier Dony 95a2f8b121 [MERGE] Forward-port latest bugfixes from 8.0 up to cbb51610ee 2015-02-24 14:47:19 +01:00
Goffin Simon cbb51610ee [FIX] ir.ui.view: qweb translations: allow looking up translation in parent template 
- Translations lookup normally uses the namespace of the current
QWeb template, after merging all inherited views.
But when a QWeb template is "cloned" by a child view using
inheritance with `primary` mode, the translations are more
likely to exist for the original (parent) template, and would not
be found when using only the "child" namespace.
This patch adds support for looking up each translation
also in the parent namespace in this case, if none was found
for the child template in the first place.

- ir.translation's _get_source() now supports a list of res_id
to search for, in addition to a single res_id

- Also moved the logic of routes /website/customize_template_get
and /website/get_view_translations to the ir.ui.view model where
it belongs.

opw: 615241

Closes #5325
 2015-02-24 14:01:34 +01:00
Christophe Simonis 3792f502d7 [IMP] website: keep id in inherited view. 
This help migration as some (not yet updated) inherited views still
hook on this id.
 2015-02-23 18:21:41 +01:00
Christophe Simonis e13923c0db [IMP] website: better website.menu view 2015-02-20 17:45:16 +01:00
Gaurav Panchal 9aea2e802d [IMP] product, point_of_sale: clean demo categories 2015-02-20 16:50:43 +01:00
Christophe Simonis 5446d4ef6c [IMP] website: better error when view not found 2015-02-20 12:07:33 +01:00
Christophe Matthieu 856f03bf9b [FIX] website: when a snippet have a o_not_editable class the contentEditable=false must added automatically. 2015-02-18 12:23:09 +01:00
Olivier Dony 91d4b947f6 [I18N] Update translations from Launchpad 8.0 branches 2015-02-18 11:51:07 +01:00
Christophe Simonis 1b3fb3c4a8 [MERGE] forward port of branch 8.0 up to 222b2d3 2015-02-17 18:54:52 +01:00
David Monjoie 832c3e1393 [FIX] website: soften the selector to find the text image snippet 2015-02-17 08:57:23 +01:00
David Monjoie 1169b52cf1 [IMP] website: each snippet is now in its own template 
It will be useful for the designers so they can call one snippet separately. It also separates the snippets definitions from the panel itself which makes more sense.
 2015-02-17 08:56:58 +01:00
David Monjoie 0d18132b11 Revert "[IMP] website: each snippet is now in its own template" 
Should have checked the js test before pushing to master, was too quick, sorry.

This reverts commit e48b8ada43.
 2015-02-16 14:13:00 +01:00
David Monjoie e48b8ada43 [IMP] website: each snippet is now in its own template 
It will be useful for the designers so they can call one snippet separately. It also separates the snippets definitions from the panel itself which makes more sense.
 2015-02-16 13:48:18 +01:00
Christophe Matthieu 8a10204e38 [FIX] website summernote: scroll top when change the style of the text, need ta add the forgotten preventDefault 2015-02-16 13:34:25 +01:00
Christophe Matthieu a7e0b73930 [FIX] website: need to add an attribute on html to apply css selector in function of the browser. Fix the media video display for ie 2015-02-16 10:49:28 +01:00
Jeremy Kersten 0c7c50b938 [FIX] website: allow to edit a page created by cms. 
Without this fix, you cannot use html_editor to edit page create
with the front end.

Since we don't store the new page in field `xml_id´ but in field `key´,
we need to search also into this field.
 2015-02-16 10:01:01 +01:00
Fabien Pinckaers 1d7f266c1f [IMP] Project form view cleaned 2015-02-15 20:32:29 +01:00
Jeremy Kersten 7638fe51a9 [FIX] website*: SEO optimizely 2015-02-13 13:51:01 +01:00
Christophe Matthieu d88ba0c6c7 [FIX][REF] website: reverted deletion of new published button by 28ed28f945 2015-02-13 11:50:49 +01:00
Fabien Pinckaers 69746e4a53 [ADD] meta generator Odoo 2015-02-13 08:57:54 +01:00
Jeremy Kersten 165c67e879 [FIX] website: improve delete page 
Clear cache after delete view
    Move menu to keep all 'New page', 'New blog', 'New forum', ... together
    Disable continue button from popup while user don't confirm with checkbox
    English typo
 2015-02-12 18:19:19 +01:00
Christophe Matthieu a9bf846b6f [FIX] website editor: don't save the page (don't trigger the change) when click on clone snippet 2015-02-12 18:01:41 +01:00
Christophe Matthieu fd9ee5e28b [FIX] website summernote: back to the top when change the font-size 2015-02-12 18:01:08 +01:00
Christophe Matthieu 9ee7ed2e18 [FIX] website editor: open the media dialog when double click on summernote button for forum; raise if click on a button before click inside the editor 2015-02-12 17:20:11 +01:00
Christophe Matthieu b84817bb78 [FIX] website: backend editor try to save the history in readonly mode when user change the record 2015-02-12 16:51:29 +01:00
Christophe Matthieu e941bab124 [FIX] website summernote: code, quote formatblock not work properly and split the selection like other formating 2015-02-12 15:08:11 +01:00
Christophe Matthieu 126282f810 [IMP] website: designer can push space after comma on input of the modal to customize theme 2015-02-12 15:06:26 +01:00
Jérome Maes ba827fc6ee [FIX] website_qweb : extract the preparation of qcontext for website. Create a prepare_qcontext method to add variables required to render template extending website.layout (like im_livechat channel, or salorder of ecommerce) 2015-02-12 14:29:07 +01:00
Christophe Simonis 392d995d1f [MERGE] forward port of branch 8.0 up to c7648a1 2015-02-12 13:20:54 +01:00
Christophe Matthieu 9fbdd2d83d [IMP] website: improve speed of test crawl and load only one slug by route 
If they are this routes:
/partner/p-1
/partner/p-2
...
/partner/grade-1/p-1
/partner/grade-1/p-2
...
/partner/grade-2/p-1
/partner/grade-2/p-2
...
We want test only one time the routes:
/partner/p-1
/partner/grade-1/p-1
 2015-02-12 12:26:23 +01:00
Christophe Matthieu 28ed28f945 [IMP] website: create a new web editor in the backend to edit html field with the website builder 2015-02-12 11:58:12 +01:00
Christophe Matthieu a46a060f0f [FIX] website editor: add a p tag when user insert a char in empty editable area 2015-02-12 11:58:12 +01:00
Christophe Matthieu 95c3573fd4 [FIX] website summernote: apply font does set the color to the alone font awsome. 2015-02-12 11:58:12 +01:00
Christophe Matthieu 4a6a90a353 [IMP] website editor: add color picker into the top editor bar for font awsome 2015-02-12 11:58:12 +01:00
Christophe Matthieu 83c4222601 [fix] website summernote: last button of the table update raise for wrong history call 2015-02-12 11:58:12 +01:00
Christophe Matthieu ebc5b3b11b [IMP] summernote: dom.isImg is unnecessary, because isVoid function contains that. 2015-02-12 11:58:11 +01:00
Christophe Simonis 3015684fe0 [IMP] website: show website name in navbar 2015-02-11 14:06:08 +01:00
Christophe Matthieu 444e9ef8c8 [FIX] website: item with the class css_editable_mode_hidden not in editable area are not hide in edit mode 2015-02-11 13:19:50 +01:00
Christophe Matthieu e8526dd013 [IMP] website: menu editor open a modal to select the menu to edit if more of one menu in the page (like event) 2015-02-11 12:31:52 +01:00
Christophe Matthieu 07e734cab8 [FIX] website editor: don't not apply o_is_inline_editable class for image field to keep image in center 2015-02-09 16:06:36 +01:00
Goffin Simon c6e2d97c04 [FIX] Website: Image editing not possible with safari. 
opw-626209
 2015-01-30 08:53:33 +01:00
Jeremy Kersten 905dd42b87 [IMP] website: allow to delete page - fix 440 - forum Q47292 2015-01-29 11:03:31 +01:00
pga-odoo e31450f536 [IMP] website : change banner image of 'banner' snippet 2015-01-27 11:31:53 +01:00
Olivier Dony 8e03852fd4 [I18N] Update translations from Launchpad 8.0 branches 2015-01-26 16:36:51 +01:00
Christophe Matthieu a65fee458a [IMP] website editor: display snippet block on the left side and open it on mouse enter 2015-01-26 10:14:02 +01:00
Christophe Matthieu 88c1b40dea [FIX] website: snippet gallery in mode slideshow: When selecting an image, the previous one is highlighted when add images. Can't display the first image. 2015-01-23 12:44:26 +01:00
Christophe Matthieu 113e6addad [IMP] website editor: select all the text if it's a default snippet text without any change 2015-01-23 12:14:15 +01:00
Christophe Matthieu 1d072a8fda [FIX] website editor: not display bullet of list when apply and remove folded list option 2015-01-23 12:14:15 +01:00
Christophe Matthieu 64b0c36f16 [FIX] summernote lib: scroll to top when click on input in editable mode 2015-01-23 12:14:15 +01:00