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

[12.0][MIG] web_widget_digitized_signature #1325

Merged
merged 12 commits into from
Jul 17, 2019

Conversation

max3903
Copy link
Member

@max3903 max3903 commented Jul 5, 2019

#1048
Superseeds #1318

@max3903 max3903 added this to the 12.0 milestone Jul 5, 2019
@OCA-git-bot OCA-git-bot mentioned this pull request Jul 5, 2019
40 tasks
@max3903 max3903 force-pushed the 12.0-mig-web_widget_digitized_signature branch from 3478aca to 2604908 Compare July 5, 2019 17:40
@max3903 max3903 requested review from mgosai, cubells and pedrobaeza July 5, 2019 17:41
@pedrobaeza
Copy link
Member

Is the other PR from a member of your team? If not, it sound irespectful to superseed without asking first.

@max3903 max3903 force-pushed the 12.0-mig-web_widget_digitized_signature branch from 2604908 to 200e2f8 Compare July 5, 2019 17:44
@max3903
Copy link
Member Author

max3903 commented Jul 5, 2019

@pedrobaeza Yes. He pushed to his own account, instead of our organization.

@pedrobaeza
Copy link
Member

OK then

Copy link
Member

@pedrobaeza pedrobaeza left a comment

Choose a reason for hiding this comment

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

Adding a lot of noise, lobbying and no valuable changes: the module would work in 12.0 as is.

'website': 'https://github.com/OCA/web',
"license": "AGPL-3",
"category": 'Web',
'license': 'AGPL-3',
Copy link
Member

Choose a reason for hiding this comment

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

Don't increase the diff if not needed. Disable automatic formatting like black for this.

Copy link
Member Author

Choose a reason for hiding this comment

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

@pedrobaeza I think migration is a great opportunity to clean up those inconsistencies of having simple and double quote within the same manifest file.

Copy link
Member

Choose a reason for hiding this comment

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

Well, I don't see them as inconsistencies. Both are allowed in Python the same and it doesn't produce any visual problem. We don't have any guideline that forces to unify them. Even if so, that must be done on a separate commit [REF] style or similar.

string='Signature',
oldname="signature_image",
)
digital_signature = fields.Binary(string='Digital Signature',
Copy link
Member

Choose a reason for hiding this comment

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

The same about automatic formatting

Copy link
Member

Choose a reason for hiding this comment

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

You can add attachment=True and add migration script for saving space in DB

@@ -1,4 +1,6 @@
* Jay Vora <[email protected]>
* Tecnativa <https://www.tecnativa.com>:
Copy link
Member

Choose a reason for hiding this comment

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

Please don't plain our formatting system for putting the company URL.

* Pedro M. Baeza <[email protected]>
* Vicent Cubells <[email protected]>
* Mayank Gosai <[email protected]>
* Maxime Chambreuil <[email protected]>
Copy link
Member

Choose a reason for hiding this comment

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

2 contributors for this minimum changes?

@max3903
Copy link
Member Author

max3903 commented Jul 10, 2019

@mgosai Can you take care of the comments please to get this merged? Thanks.

@pedrobaeza
Copy link
Member

Please squash all these commits

@nikul-serpentcs
Copy link
Member

@max3903 @mgosai Can you please Travis

oca-transbot and others added 2 commits July 16, 2019 10:27
Updated by "Update PO files to match POT (msgmerge)" hook in Weblate.

Translation: web-11.0/web-11.0-web_widget_digitized_signature
Translate-URL: https://translation.odoo-community.org/projects/web-11-0/web-11-0-web_widget_digitized_signature/
@max3903 max3903 force-pushed the 12.0-mig-web_widget_digitized_signature branch from 4156e3d to 7008038 Compare July 16, 2019 15:28
@max3903
Copy link
Member Author

max3903 commented Jul 16, 2019

@nikul-serpentcs Done!

@pedrobaeza
Copy link
Member

This still has undesired auto-format changes I have already mentioned.

@max3903 max3903 requested a review from nikul-serpentcs July 16, 2019 15:58
Copy link
Member

@nikul-serpentcs nikul-serpentcs left a comment

Choose a reason for hiding this comment

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

Only Code Review LGTM 👍

@max3903 Please check/modify others reviewer comment's also

@max3903
Copy link
Member Author

max3903 commented Jul 17, 2019

@pedrobaeza All the changes are desired.

@max3903
Copy link
Member Author

max3903 commented Jul 17, 2019

/ocabot merge

@OCA-git-bot
Copy link
Contributor

This PR looks fantastic, let's merge it!
Rebased to 12.0-ocabot-merge-pr-1325-by-max3903-bump-no, awaiting test results.

@OCA-git-bot OCA-git-bot merged commit 7008038 into OCA:12.0 Jul 17, 2019
@OCA-git-bot
Copy link
Contributor

Congratulations, your PR was merged at 0be0575. Thanks a lot for contributing to OCA. ❤️

PS: Don't worry if GitHub says there are unmerged commits: it is due to a rebase before merge. All commits of this PR have been merged into 12.0.

OCA-git-bot added a commit that referenced this pull request Jul 17, 2019
Signed-off-by max3903
@pedrobaeza
Copy link
Member

No, they aren't desired, and if you want to do it, you must split that changes in a separate commit apart from the migration as stated.

Please don't disobey next time as you always do and launch the merge command without agreement.

@max3903 max3903 deleted the 12.0-mig-web_widget_digitized_signature branch July 17, 2019 13:39
@rafaelbn
Copy link
Member

Hi @max3903 ,

I don't think is good practice to merge with a disagree of a PCS, you should then ask maybe another PSC in @OCA/web-maintainers but not merge.

You add Coyright, Author and 2 contribution by changin " by ' 7008038 plus 4 lines of code 7008038#diff-7a2fc2224315edb7571db98b9462f6e1

We must also maintain the same criteria for all when it comes to attributing contributions or authorizations. If you make a migration of a module with a diff of 40 lines of which code change are 4 lines, then what is the criterion. You have to be fair.

This is not something that of course takes away the dream, it is not harmful for Tecnativa. But it is harmful and unfair in my personal opinion for OCA and the rest of the contributors.

Regards

@max3903
Copy link
Member Author

max3903 commented Jul 18, 2019

Hi @rafaelbn,

The changes I pushed are cosmetic changes to facilitate code readibility and have consistency:

  • Having double quote and single quote in the same manifest doesn't make sense to me.
  • Having XML file with 120+ characters line either.

I don't see the point of doing separate pull requests of the same module for that and asking people to review this separately. Let's not waste everyone else time on this. Especially when we ask people later to squash commits...

Also this is a Tecnativa module that we decided to maintain, so give me a break. If you wanted to take care of it and maintain it, you had plenty of time to provide an alternative maintainer.

I think we discussed it long enough last year, this kind of behavior is negative for the community. We should welcome contributions and improve them, not reject them.

@rafaelbn
Copy link
Member

We should welcome contributions and improve them, not reject them

Absolutely agree here, I'm very concerned about expanding OCA

@pedrobaeza
Copy link
Member

I was asking for 2 separated commits, not 2 PRs as now it's very difficult to know which changes are due to 12.0 needs and what are only cosmetic changes. It's not too much to ask.

@hbrunn
Copy link
Member

hbrunn commented Jul 18, 2019

I agree it's a good thing to ask contributors to keep the history clean. So very often I'm stuck in some combined commit when I want to follow how some code came to place, I appreciate every effort to be strict there.

But given the 2 PRs / 2 commits misunderstanding, can we file it as such and move on? And let's learn from it and write some suggestions about this in CONTRIBUTING.rst.

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.