11.0 website multi theme port from 10 by yelizariev · Pull Request #450 · OCA/website

yelizariev · 2018-04-23T22:31:12Z

WIP
We will check it internally first.

* [FIX] point inherit to copied views Otherwise theme_customize doesn't work when we have chain of views like in theme_clean: theme_clean.option_bg_shade_light2 inherits theme_clean.less theme_clean.less inherits website.assets_frontend without this update, website_multi_theme copies theme_clean.option_bg_shade_light2 but keeps inherit_id the same (i.e. to theme_clean.less, which is not used, because it has a copy) * [LINT] remove unused arguments, add semicolon

Current implementation disabled all backend views from a theme addon when converting it to multiwebsite mode. This is now fixed, and includes a migration script to make things work again if you hit this situation in your database.

See OCA#444 (comment) for details.

New field "auto" in "website.theme.asset" to distinguish assets created from theme and ones created in xml. It's needed, for example, for non-module themes (like Demo theme) be handled in _convert_assets (before this update such themes were skipped) [REF] field multi_theme_generated is replaced with origin_view_id [IMP] apply default theme after installation [IMP] reload themes on installing new modules with customize_show [CI] Website always have Multi-Theme now. Also, increase default timeout (10 sec) to 60 sec, because it may take more time now

on installing module with customize_show Reload is done automatically

emagdalenaC2i · 2018-04-24T10:35:00Z

Is not migrated already? Check #398

pedrobaeza · 2018-04-24T10:49:25Z

This is a recent improvement.

Railia

👍

yelizariev · 2018-04-24T14:38:39Z

@emagdalenaC2i #398 was made by me 😉

yelizariev · 2018-04-30T17:52:36Z

I'll add more updates from 10.0 after #453 and #452

closes OCA#409

closes OCA#410 [CI] test coverage for duplicated snippets

which avoids recursive reloading

* new name for res.config * move snippets lower, because website's tour use 4th element

yelizariev · 2018-05-03T13:57:24Z

New updates to be merged here: ~~#457~~ #456

yelizariev · 2018-05-07T21:41:40Z

This error is randomly shown on travis checks

ssertionError: ("TypeError: undefined is not an object (evaluating 'manipulatorOffset.top')\n"
' at '
'http://127.0.0.1:8069/web/content/512-6922043/web_editor.assets_editor.js:132 '
'(in cover)\n'
' at '
'http://127.0.0.1:8069/web/content/512-6922043/web_editor.assets_editor.js:133 '
'(in toggleFocus)\n'
' at '
'http://127.0.0.1:8069/web/content/512-6922043/web_editor.assets_editor.js:162\n'
' at http://127.0.0.1:8069/web/content/509-3597dce/web.assets_common.js:802\n'
' at http://127.0.0.1:8069/web/content/509-3597dce/web.assets_common.js:796 '
'(in fire)\n'
' at http://127.0.0.1:8069/web/content/509-3597dce/web.assets_common.js:797 '
'(in add)\n'
' at http://127.0.0.1:8069/web/content/509-3597dce/web.assets_common.js:802\n'
' at http://127.0.0.1:8069/web/content/509-3597dce/web.assets_common.js:625 '
'(in each)\n'
' at http://127.0.0.1:8069/web/content/509-3597dce/web.assets_common.js:802\n'
' at http://127.0.0.1:8069/web/content/509-3597dce/web.assets_common.js:803 '
'(in Deferred)\n'
' at http://127.0.0.1:8069/web/content/509-3597dce/web.assets_common.js:802 '
'(in then)\n'
' at '
'http://127.0.0.1:8069/web/content/512-6922043/web_editor.assets_editor.js:162 '
'(in _activateSnippet)\n'
' at '
'http://127.0.0.1:8069/web/content/512-6922043/web_editor.assets_editor.js:150\n'
' at http://127.0.0.1:8069/web/content/509-3597dce/web.assets_common.js:892 '
'(in dispatch)\n'
' at http://127.0.0.1:8069/web/content/509-3597dce/web.assets_common.js:865 '
'(in handle)\n'
' at :0 (in dispatchEvent)\n'
' at http://127.0.0.1:8069/web/content/509-3597dce/web.assets_common.js:4187 '
'(in trigger_mouse_event)\n'
' at http://127.0.0.1:8069/web/content/509-3597dce/web.assets_common.js:4187 '
'(in _click)\n'
' at http://127.0.0.1:8069/web/content/509-3597dce/web.assets_common.js:4187 '
'(in _text)\n'
' at http://127.0.0.1:8069/web/content/509-3597dce/web.assets_common.js:4186 '
'(in text)\n'
' at http://127.0.0.1:8069/web/content/509-3597dce/web.assets_common.js:4204\n'
' at :0\n'
' at http://127.0.0.1:8069/web/content/509-3597dce/web.assets_common.js:44\n'
'(leaf frame on top)')

yelizariev · 2018-05-07T21:42:33Z

I'd like to set status "Needs review" to this issue and postpone with #456 which is not merged yet

yelizariev · 2018-05-15T19:53:38Z

now #456 is in this PR too, i.e. all updates from 10.0 are here

Also, change 127.0.0.1 to 0.0.0.0 because latter is used in odoo for second demo website

yelizariev · 2018-05-17T17:38:20Z

Checked internally and found misunderstanding about Multi-footer. I've added a note to documentation in latest commit

ilmir-k

tested 👍
looks good to me

yajo

@yelizariev Is this ready to merge then?

yelizariev · 2018-05-22T15:41:14Z

@yajo yes, it's ready. We did all we can. We will continue to test it with website_multi_company module once this PR is merged

pedrobaeza · 2018-05-22T16:49:04Z

Please squash a bit some unneeded commits and I'll merge. Thanks for the work checking these rough edges.

yelizariev · 2018-05-22T16:58:11Z

I found and done another thing that was in discussion #409 (comment)

yelizariev · 2018-05-22T16:59:59Z

@pedrobaeza most commits were cherry-picked. I think it's better to keep them to easy comparing with 10.0 branch.

yajo

Code & functional review

yajo · 2018-05-23T07:36:05Z

+<odoo>
+
+    <record model="ir.module.category" id="base.module_category_theme">
+        <field name="exclusive" eval="False"/>


I can't believe it was so simple! Could you backport this to v10? 🤔 Or was it hardcoded in v10?

Yes, it's hardcoded and the only way is rewrite (not inherit) one method

Ivan Yelizariev and others added 8 commits April 24, 2018 02:35

[FIX] "data" referenced before assignment + some refactoring

8cf4b67

[CI] add coverage for new block case in _multi_theme_activate

11d7ae1

[FIX] website_multi_theme: Manage only Qweb views

3558be3

Current implementation disabled all backend views from a theme addon when converting it to multiwebsite mode. This is now fixed, and includes a migration script to make things work again if you hit this situation in your database.

[FIX] website_multi_theme: Take into account disabled views (OCA#447)

0a816df

See OCA#444 (comment) for details.

[DOC] remove incorrect note

951ac66

on installing module with customize_show Reload is done automatically

[11.0] port updates from 10.0

a0fbddd

Railia approved these changes Apr 24, 2018

View reviewed changes

Ivan Yelizariev added 5 commits May 1, 2018 19:34

[IMP] support for sub-themes (OCA#454)

34b4de8

closes OCA#409

[FIX] error on applying multi-theme with snippets on few websites

c55b2d7

closes OCA#410 [CI] test coverage for duplicated snippets

[FIX] proper place for context

7118c3c

which avoids recursive reloading

[PORT] port updates from 10.0

13591d9

* new name for res.config * move snippets lower, because website's tour use 4th element

[IMP] use hasclass in xpath

c48e1d2

rafaelbn added the work in progress label May 2, 2018

rafaelbn added this to the 11.0 milestone May 2, 2018

Ivan Yelizariev added 2 commits May 7, 2018 22:39

[FIX] button method cannot be api.model

80ba37e

[FIX] active_test is missed

bbca139

yajo added needs review and removed work in progress labels May 14, 2018

Railia approved these changes May 14, 2018

View reviewed changes

[FIX] duplicate creation must be done in correct order

6f4d94e

yelizariev mentioned this pull request May 15, 2018

11.0 merge fcb85d2 itpp-labs/website-addons#307

Closed

[DOC] note about addint Default Theme to *Sub-themes*

3885799

Also, change 127.0.0.1 to 0.0.0.0 because latter is used in odoo for second demo website

ilmir-k approved these changes May 22, 2018

View reviewed changes

yajo approved these changes May 22, 2018

View reviewed changes

[FIX] allow install several theme at once

8f3c0b4

yajo approved these changes May 23, 2018

View reviewed changes

yajo merged commit fe94b15 into OCA:11.0 May 23, 2018

yelizariev mentioned this pull request Jun 20, 2018

11.0 mig website_form_builder #476

Merged

yajo mentioned this pull request Jun 20, 2018

Random failures on travis tests with website_multi_theme #487

Closed

Uh oh!

Conversation

yelizariev commented Apr 23, 2018 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

emagdalenaC2i commented Apr 24, 2018

Uh oh!

pedrobaeza commented Apr 24, 2018

Uh oh!

Railia left a comment

Choose a reason for hiding this comment

Uh oh!

yelizariev commented Apr 24, 2018

Uh oh!

yelizariev commented Apr 30, 2018

Uh oh!

yelizariev commented May 3, 2018 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

yelizariev commented May 7, 2018

Uh oh!

yelizariev commented May 7, 2018

Uh oh!

yelizariev commented May 15, 2018

Uh oh!

yelizariev commented May 17, 2018

Uh oh!

ilmir-k left a comment

Choose a reason for hiding this comment

Uh oh!

yajo left a comment

Choose a reason for hiding this comment

Uh oh!

yelizariev commented May 22, 2018

Uh oh!

pedrobaeza commented May 22, 2018

Uh oh!

yelizariev commented May 22, 2018

Uh oh!

yelizariev commented May 22, 2018

Uh oh!

yajo left a comment

Choose a reason for hiding this comment

Uh oh!

yajo May 23, 2018

Choose a reason for hiding this comment

Uh oh!

yelizariev May 23, 2018

Choose a reason for hiding this comment

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

7 participants

yelizariev commented Apr 23, 2018 •

edited

Loading

yelizariev commented May 3, 2018 •

edited

Loading