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

[FIX][9.0] auto_backup: Missing files #636

Merged
merged 53 commits into from
Dec 16, 2016

Conversation

lasley
Copy link
Contributor

@lasley lasley commented Dec 7, 2016

This reverts commit 0111be2, which was committed directly to 9.0 & pulled the files from #620 that contained an identical commit 8a078fc.

This is the cleanest way that I see to resolve #619 (comment).

The alternative is another migration, which will add another 50 some odd commits.

Anyone have thoughts?

@lasley lasley added this to the 9.0 milestone Dec 7, 2016
Copy link

@antespi antespi left a comment

Choose a reason for hiding this comment

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

LGTM 👍

@lasley
Copy link
Contributor Author

lasley commented Dec 7, 2016

Dammit I just realized with this then we'll circle back around to the original #620. I guess re-migrating the module will be the best solution in hindsight. I'll just backport from my 10.0 #614 once merged.

@antespi
Copy link

antespi commented Dec 7, 2016

Ok, thanks

lasley and others added 22 commits December 7, 2016 13:02
* Remove translations that were part of bad commits & now conflict with rebasing
Added all the new fields and sentences. This will be the template for
translations.
Full translation of the module to Dutch
Add Chinese translations to the module. Written by talway.
Changed some translations
Thanks to Martin Schmid!
could'nt > couldn't
Flemish translations are identical to Dutch.
Used to open  fp = open(file_path,'wb') a few lines before it was needed. This shouldn't be too much of a problem but opening and closing it right after eachother keeps the session open for less time and there are less chances on failure.
@lasley lasley force-pushed the hotfix/9.0/auto_backup-commit_history branch from 3d6338a to 8aea3ba Compare December 7, 2016 21:06
@lasley lasley changed the title Revert "Revert "[9.0][MIG] auto_backup (#526)"" [FIX][9.0] auto_backup: Missing files Dec 7, 2016
@lasley
Copy link
Contributor Author

lasley commented Dec 9, 2016

I'm going to look at this in the next few days. I'm in conflict heaven hell in any sort of migration direction due to the translation files being on 9 branch.

I guess I'm just going to start again, delete the migrations, then re-upgrade this module to 9. I really only needed it in 10 though, so bottom of my work stack TBH seeing as this is will be my third time migrating it to a version I don't need.

@lasley lasley force-pushed the hotfix/9.0/auto_backup-commit_history branch from 8aea3ba to e5f4ed8 Compare December 13, 2016 19:00
@lasley
Copy link
Contributor Author

lasley commented Dec 13, 2016

Ok I think I got this to the state it was on merge on 9. There's this dirty hack I had to do in 8c45b49 to delete the translations that are already there so that the commits could be walked back onto the branch.

It seems there are some missing translation files in this PR though, but everything that I do ends up with them not there. I'm hoping maybe that will correct itself when Transifex tries to update the branch?

* Add self.ensure_ones
* Add test coverage
@lasley lasley force-pushed the hotfix/9.0/auto_backup-commit_history branch from e5f4ed8 to 43ed6e8 Compare December 13, 2016 21:06
@antespi
Copy link

antespi commented Dec 13, 2016

Thanks @lasley 👍

@antespi
Copy link

antespi commented Dec 13, 2016

Password for runbot: Admin:1234567890

@susport
Copy link

susport commented Dec 14, 2016

@antespi With that password I can not authenticate in runbot

@lasley
Copy link
Contributor Author

lasley commented Dec 14, 2016

Username is admin Password is Admin:1234567890. Hah this repo is fun now that password_security is a thing

@antespi
Copy link

antespi commented Dec 14, 2016

@lasley thanks for your clarification and sorry @susport for the confusion.
Now, OCA/server-tools runbots have this issue

@lasley
Copy link
Contributor Author

lasley commented Dec 14, 2016

I'm probably going to provide a fix for that soon. Something to disable the security on the admin user unless an option is explicitly enabled I'm thinking

@lasley lasley merged commit 1325470 into OCA:9.0 Dec 16, 2016
@lasley lasley deleted the hotfix/9.0/auto_backup-commit_history branch December 16, 2016 08:02
@lasley
Copy link
Contributor Author

lasley commented Dec 16, 2016

I'm going to go ahead and merge this. It's pretty broken on 9.0 branch as it is & this was all approved a bunch of times, so I don't see the harm. Worse case scenario it's still broken, right? 😛

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.

9 participants