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.

Sign up for GitHub

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

Jump to bottom

Bugfix/#724 #1212

Closed
wants to merge 5 commits into from
Closed

Bugfix/#724 #1212

wants to merge 5 commits into from

Conversation

aklife97
Copy link
Contributor

@aklife97 aklife97 commented Mar 6, 2017

Proposed changes in this pull request

When should this PR be merged

  • Works fine. Can be merged

Risks

  • None

Follow up actions

  • None

Checklist (for reviewing)

General

  • Is this PR explained thoroughly? All code changes must be accounted for in the PR description.
  • Is the PR labeled correctly? It should have the migration label if a new migration is added.
  • Is the risk level assessment sufficient? The risks section should contain all risks that might be introduced with the PR and which actions we need to take to mitigate these risks. Possible risks are database migrations, new libraries that need to be installed or changes to deployment scripts.

Functionality

  • Are all requirements met? Compare implemented functionality with the requirements specification.
  • Does the UI work as expected? There should be no Javascript errors in the console; all resources should load. There should be no unexpected errors. Deliberately try to break the feature to find out if there are corner cases that are not handled.

Code

  • Do you fully understand the introduced changes to the code? If not ask for clarification, it might uncover ways to solve a problem in a more elegant and efficient way.
  • Does the PR introduce any inefficient database requests? Use the debug server to check for duplicate requests.
  • Are all necessary strings marked for translation? All strings that are exposed to users via the UI must be marked for translation.

Tests

  • Are there sufficient test cases? Ensure that all components are tested individually; models, forms, and serializers should be tested in isolation even if a test for a view covers these components.
  • If this is a bug fix, are tests for the issue in place There must be a test case for the bug to ensure the issue won’t regress. Make sure that the tests break without the new code to fix the issue.
  • If this is a new feature or a significant change to an existing feature has the manual testing spreadsheet been updated with instructions for manual testing?

Documentation

  • Are changes to the UI documented in the platform docs? If this PR introduces new platform site functionality or changes existing ones, the changes must be documented in the Cadasta Platform Documentation.
  • Are changes to the API documented in the API docs? If this PR introduces new API functionality or changes existing ones, the changes must be documented in the API docs.
  • Are reusable components documented? If this PR introduces components that are relevant to other developers (for instance a mixin for a view or a generic form) they should be documented in the Wiki.

oliverroick
oliverroick requested changes Mar 7, 2017
View reviewed changes
Copy link
Member

@oliverroick oliverroick left a comment

Choose a reason for hiding this comment

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

Hi @aklife97, thank you for your contribution.

Before we we can proceed with your PR, I would like to ask you to make sure your build passes on Travis. The build is failing because your code violates PEP-8 conventions. You run the linter locally in your VM using ./runtests.py --lint from the directory /vagrant to find out which lines were not accepted.

@aklife97
Copy link
Contributor Author

aklife97 commented Mar 7, 2017

@oliverroick Fixed the code to pass the PEP8 violations. Will not forget to lint before sending other pull requests :)

oliverroick
oliverroick requested changes Mar 8, 2017
View reviewed changes
Copy link
Member

@oliverroick oliverroick left a comment

Choose a reason for hiding this comment

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

Hi @aklife97, thank you for making the changes. What you have done so far looks good.

Your approach, however, does not send a confirmation email when the password is changed after a reset. Could you try a find a way to do that?

Also, instead of hard coding the email text, it is better to use a template and mark the text for translation so we can send the email in the user's preferred language. Using a template also allows us to send the same email in other cases if we ever need to.

@aklife97
Copy link
Contributor Author

aklife97 commented Mar 8, 2017

@oliverroick Hi,
I am facing a bit trouble with makemessages script here. Even after executing the script, I don't get to see the translation in the email that is sent. Could you please help me out with this.
Also, should I push only the changes in code and templates or should I also include the newly created .po files.
Thanks

@oliverroick
Copy link
Member

Don't worry about running makemessages; we'll take care of that. Also don't add your .po files please; it'll make things easier.

The reason you don't see a translated message is probably because you haven't provide a translation or the translations are not compiled. That said, you don't need to provide translations, we're using Transifex for that. Only mark it for translation and that's it

@aklife97
Copy link
Contributor Author

aklife97 commented Mar 8, 2017 •
edited
Loading

@oliverroick
Okay, I have updated as per what you asked. Please see to it :)

@oliverroick oliverroick self-assigned this Mar 11, 2017
oliverroick
oliverroick requested changes Mar 13, 2017
View reviewed changes
Copy link
Member

@oliverroick oliverroick left a comment

Choose a reason for hiding this comment

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

Hi @aklife97, thanks for making the changes. There is a small code style issue I would like you to fix; please see the comment in the code.

Could you also add tests to verify that the email is sent? I would add tests to for both forms and serializers to verify this works across different access points.

Thanks again!

cadasta/accounts/models.py
def password_changed_reset(sender, request, user, **kwargs):
msg_body = get_template(
"accounts/email/password_change_successful.txt"
).render(Context({'user': user}))
Copy link
Member

Choose a reason for hiding this comment

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

The context is not used in the template; there's no need to create and pass it.

@oliverroick
Copy link
Member

oliverroick commented Mar 28, 2017 •
edited
Loading

This PR has been inactive for two weeks. Closing this in favour of #1353.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@oliverroick oliverroick oliverroick requested changes

Assignees

@oliverroick oliverroick

Labels
PR: bugfix PR: needs review PR: needs testing
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

Send an email when a user changes the password
2 participants
@aklife97 @oliverroick