Skip to content

11.0 mig website legal page - #403

Merged
yajo merged 26 commits into
OCA:11.0from
nadiaafa:11.0-mig-website_legal_page
Jan 26, 2018
Merged

yajo merged 26 commits into
OCA:11.0from
nadiaafa:11.0-mig-website_legal_page

Conversation

@nadiaafa

Copy link
Copy Markdown
Contributor

No description provided.

@pedrobaeza pedrobaeza added this to the 11.0 milestone Dec 21, 2017
@pedrobaeza pedrobaeza mentioned this pull request Dec 21, 2017
38 tasks
@njeudy

njeudy commented Jan 12, 2018

Copy link
Copy Markdown

@nadiaafa can you squash transbot commit ?

</t>
</p>
<div>
<t t-if="res_company.phone or res_company.email or res_company.fax">

Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

res_company.fax does not exist anymore

</t>
</div>
<div>
<t t-if="res_company.phone or res_company.email or res_company.fax">

Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

res_company.fax does not exists anymore

@njeudy

njeudy commented Jan 13, 2018

Copy link
Copy Markdown

@nadiaafa can you add me to your merge request branch ? I can make changes if needed .

@nadiaafa

Copy link
Copy Markdown
Contributor Author

thank you @njeudy i added you 👍

@njeudy
njeudy force-pushed the 11.0-mig-website_legal_page branch 2 times, most recently from ffe0f58 to 2f9e7ae Compare January 13, 2018 15:02
@njeudy

njeudy commented Jan 13, 2018

Copy link
Copy Markdown

I clean history and keep you as author of last commit :) wait for ci :)

@nadiaafa

Copy link
Copy Markdown
Contributor Author

Merci @njeudy

@njeudy

njeudy commented Jan 14, 2018

Copy link
Copy Markdown

@nadiaafa should look to test failed .. will work on it tomorrow.

@njeudy

njeudy commented Jan 18, 2018

Copy link
Copy Markdown

Think odoo 11 return 200 and not 404 when page does not existe, because

"GET http://legal/no-page HTTP/1.1" 200 -

Because odoo propose to create un new page

capture d ecran 2018-01-18 21 36 51

Will change test function to reflect this ..

@njeudy
njeudy force-pushed the 11.0-mig-website_legal_page branch from 2f9e7ae to fccd802 Compare January 18, 2018 20:41
@oca-clabot

Copy link
Copy Markdown

Hey @nadiaafa, thank you for your Pull Request.

It looks like some users haven't signed our Contributor License Agreement, yet.
You can read and sign our full Contributor License Agreement here: http://odoo-community.org/page/website.cla
Here is a list of the users:

  • Nadia AFAKROUCH (no github login found)
  • zeroheure (no github login found)
  • Nicola Malcontenti (no github login found)

Appreciation of efforts,
OCA CLAbot

@njeudy
njeudy force-pushed the 11.0-mig-website_legal_page branch from fccd802 to 592910b Compare January 19, 2018 07:34
@njeudy

njeudy commented Jan 21, 2018

Copy link
Copy Markdown

@pedrobaeza @lasley should we correct lint error that is on an other module ?

@lasley

lasley commented Jan 22, 2018

Copy link
Copy Markdown
Contributor

@njeudy - nah just the lints in this module will be fine. Not sure why the others are failing - AFAIK they're only supposed to trigger on changed modules.

Comment thread website_legal_page/README.rst Outdated

This module was written to provide common legal pages needed in any website:

* **Legal advice**: Website propietary and disclaimers

Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

*proprietary

Comment thread website_legal_page/__init__.py Outdated
@@ -0,0 +1,2 @@
# -*- coding: utf-8 -*-

Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

remove coding headers from all py files

Comment thread website_legal_page/__manifest__.py Outdated
'LasLabs, '
'Nicolas JEUDY, '
'Odoo Community Association (OCA)',
'website': 'https://www.tecnativa.com',

Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

response = self.url_open(page, timeout=20)
self.assertEqual(response.status_code, code)

# TODO: comment this test because odoo 11 return 200 even if page does not exist..

Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Whaaat? Seriously? 😄

Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

damn, is true...
Odoo 11:
image

Odoo 10:

image

Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I filed a bug odoo/odoo#22438

Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks :)

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Instead of this, you should:

# HACK https://github.com/odoo/odoo/issues/22438
# TODO Remove when fixed
@unittest.expectedFailure
#[and here the test, uncommented]

Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@njeudy it's fixed. Would you mind dropping the hack? :)

pedrobaeza and others added 13 commits January 23, 2018 16:15
OCA Transbot updated translations from Transifex
* Move legal pages to explicit /legal routes

Fixes by PR review

Fix my obvious lack of testing
- Update copyright headers.
- Update copyright holders data.
- Remove .pot file.
- Add migration script.
* [ADD][website_multi_theme] Allow different themes by website

This a somewhat hacky addon that adds support for setting a different theme by website.

Always updates views arch in development and demo instances.

This allows faster development, while keeping stability and no surprises in production.

* fixup! [ADD][website_multi_theme] Allow different themes by website

* fixup! fixup! [ADD][website_multi_theme] Allow different themes by website

* fixup! fixup! fixup! [ADD][website_multi_theme] Allow different themes by website

* fixup! fixup! fixup! fixup! [ADD][website_multi_theme] Allow different themes by website

* fixup! fixup! fixup! fixup! fixup! [ADD][website_multi_theme] Allow different themes by website

* fixup! fixup! fixup! fixup! fixup! fixup! [ADD][website_multi_theme] Allow different themes by website

* fixup! fixup! fixup! fixup! fixup! fixup! fixup! [ADD][website_multi_theme] Allow different themes by website

* [FIX][website_legal_page] Correctly raise a 404 error instead of a 500 if a view is not found

* fixup! fixup! fixup! fixup! fixup! fixup! fixup! [ADD][website_multi_theme] Allow different themes by website

* fixup! [FIX][website_legal_page] Correctly raise a 404 error instead of a 500 if a view is not found

* squash! fixup! [FIX][website_legal_page] Correctly raise a 404 error instead of a 500 if a view is not found

Fix tests that were getting warnings logged and random timeouts.
@njeudy
njeudy force-pushed the 11.0-mig-website_legal_page branch from 592910b to b213685 Compare January 23, 2018 15:16
@njeudy
njeudy force-pushed the 11.0-mig-website_legal_page branch from b213685 to 970fd8f Compare January 23, 2018 15:35
@njeudy

njeudy commented Jan 23, 2018

Copy link
Copy Markdown

@simahawk i can't have ci ok because ok website_multi_theme module .. and I think it depends of odoo module .. should I try to correct this ?

@simahawk

Copy link
Copy Markdown

@njeudy travis is red because of linting. You should fix that. Runbot is actually yellow for a warning but it should have been fixed in OCB and MQT.

@yajo yajo left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Fix the linter please

response = self.url_open(page, timeout=20)
self.assertEqual(response.status_code, code)

# TODO: comment this test because odoo 11 return 200 even if page does not exist..

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Instead of this, you should:

# HACK https://github.com/odoo/odoo/issues/22438
# TODO Remove when fixed
@unittest.expectedFailure
#[and here the test, uncommented]

@njeudy

njeudy commented Jan 24, 2018

Copy link
Copy Markdown

@yajo @simahawk : the linter is on an other already merge module .. I should correct in this merge request ?

************* Module website_multi_theme
website_multi_theme/__init__.py:1: [C8202(unnecessary-utf8-coding-comment), ] UTF-8 coding is not necessary
website_multi_theme/static/src/js/theme.js:15: [W7903(javascript-lint), ] 'reload' is defined but never used. [Error/no-unused-vars]
************* Module website_multi_theme.__manifest__
website_multi_theme/__manifest__.py:1: [C8202(unnecessary-utf8-coding-comment), ] UTF-8 coding is not necessary
************* Module website_multi_theme.models.__init__
website_multi_theme/models/__init__.py:1: [C8202(unnecessary-utf8-coding-comment), ] UTF-8 coding is not necessary
************* Module website_multi_theme.models.ir_qweb
website_multi_theme/models/ir_qweb.py:1: [C8202(unnecessary-utf8-coding-comment), ] UTF-8 coding is not necessary
************* Module website_multi_theme.models.ir_ui_view
website_multi_theme/models/ir_ui_view.py:1: [C8202(unnecessary-utf8-coding-comment), ] UTF-8 coding is not necessary
************* Module website_multi_theme.models.website
website_multi_theme/models/website.py:1: [C8202(unnecessary-utf8-coding-comment), ] UTF-8 coding is not necessary
************* Module website_multi_theme.models.website_theme
website_multi_theme/models/website_theme.py:1: [C8202(unnecessary-utf8-coding-comment), ] UTF-8 coding is not necessary
************* Module website_multi_theme.tests.__init__
website_multi_theme/tests/__init__.py:1: [C8202(unnecessary-utf8-coding-comment), ] UTF-8 coding is not necessary
************* Module website_multi_theme.tests.test_assets
website_multi_theme/tests/test_assets.py:1: [C8202(unnecessary-utf8-coding-comment), ] UTF-8 coding is not necessary
************* Module website_multi_theme.wizards.__init__
website_multi_theme/wizards/__init__.py:1: [C8202(unnecessary-utf8-coding-comment), ] UTF-8 coding is not necessary
************* Module website_multi_theme.wizards.website_config_settings
website_multi_theme/wizards/website_config_settings.py:1: [C8202(unnecessary-utf8-coding-comment), ] UTF-8 coding is not necessary

@njeudy
njeudy force-pushed the 11.0-mig-website_legal_page branch from a3f0c94 to 008a90a Compare January 24, 2018 20:08
@njeudy

njeudy commented Jan 24, 2018

Copy link
Copy Markdown

@simahawk @yajo ok done !!

@njeudy

njeudy commented Jan 25, 2018

Copy link
Copy Markdown

@yajo ok for you ? linter is green :)

@yajo
yajo merged commit 14d60ab into OCA:11.0 Jan 26, 2018
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.