Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[10.0] help_online fix export/import #584

Merged
merged 3 commits into from
May 31, 2017

Conversation

lmignon
Copy link
Sponsor Contributor

@lmignon lmignon commented Mar 17, 2017

No description provided.

@lmignon
Copy link
Sponsor Contributor Author

lmignon commented Mar 17, 2017

@lasley lasley added this to the 10.0 milestone Mar 17, 2017
Copy link
Contributor

@lasley lasley left a comment

Choose a reason for hiding this comment

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

@lmignon one minor note & can you also please raise the module up by a patch version in the manifest?

@@ -81,6 +81,7 @@ def createPage(self, pageName, imgXmlId=False):
'type': 'qweb',
'arch': arch,
'page': True,
'key': 'website.' + pageName
Copy link
Contributor

Choose a reason for hiding this comment

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

'website.%s' % pageName in order to handle type conversions

Copy link
Contributor

@adrienpeiffer adrienpeiffer left a comment

Choose a reason for hiding this comment

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

👍

Copy link

@felixvillafranca felixvillafranca left a comment

Choose a reason for hiding this comment

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

Works

This handles type conversions properly
@yajo yajo merged commit 95f15c4 into OCA:10.0 May 31, 2017
@dreispt
Copy link
Sponsor Member

dreispt commented Jun 1, 2017

It looks like this module is breaking the build:
https://travis-ci.org/OCA/web/jobs/237945481#L668

@lmignon
Copy link
Sponsor Contributor Author

lmignon commented Jun 1, 2017

@dreispt
It looks like a commit has been added to the initial PR just before the merge and squashed into mines.... 😡
1060820

@lmignon
Copy link
Sponsor Contributor Author

lmignon commented Jun 1, 2017

moreover, my commit history was clean and should not have been squashed. I don't want to be credited for this 💣 💥 commit. Commits from different authors can't be squashed!!!!!

@lmignon
Copy link
Sponsor Contributor Author

lmignon commented Jun 1, 2017

@yajo Can you fix your mistake PLZ

@yajo
Copy link
Member

yajo commented Jun 1, 2017

Yes, @lmignon sorry, will fix ASAP.

yajo added a commit to acsone/web that referenced this pull request Jun 1, 2017
yajo pushed a commit that referenced this pull request Jun 1, 2017
yajo added a commit that referenced this pull request Jun 1, 2017
apineux pushed a commit to acsone/web that referenced this pull request Jul 30, 2021
* [FIX] help_online:  Replace obsolete icon into the export wizard

* [FIX] help_online: Add the key attribute into the exported data
This key is required to get the pages properly imported as web pages

* Use the correct method for combining strings

This handles type conversions properly
apineux pushed a commit to acsone/web that referenced this pull request Jul 30, 2021
apineux pushed a commit to acsone/web that referenced this pull request Jul 30, 2021
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.

None yet

8 participants