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

Clearing server-side validation errors upon submit #1407

Merged
merged 2 commits into from
Apr 24, 2017
Merged

Clearing server-side validation errors upon submit #1407

merged 2 commits into from
Apr 24, 2017

Conversation

clash99
Copy link
Contributor

@clash99 clash99 commented Apr 14, 2017

Proposed changes in this pull request

  • Completes Error messages during organization creation are not cleared #1220
  • Made duplicate organization validation error translatable by transifex (once transifex gets updated)
  • Renamed form_submit_once.js to form_submit.js
  • Modified script to cover both disabling button on valid form submit or clearing server-side errors on invalid submit. Added this script to both organization add and edit and project add and edit pages.

When should this PR be merged

  • When convenient

Risks

  • Low

Follow-up actions

  • Transifex files need to be updated

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?

Security

  • Confirm this PR doesn't commit any keys, passwords, tokens, usernames, or other secrets.
  • Are all UI and API inputs run through forms or serializers?
  • Are all external inputs validated and sanitized appropriately?
  • Does all branching logic have a default case?
  • Does this solution handle outliers and edge cases gracefully?
  • Are all external communications secured and restricted to SSL?

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 Apr 19, 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.

Looks good, there's just a small thing. See below.

cadasta/organization/forms.py Outdated
@@ -135,6 +135,11 @@ def clean_name(self):
if slugify(name, allow_unicode=True) in invalid_names:
raise forms.ValidationError(
_("Organization name cannot be “Add” or “New”."))

if Organization.objects.filter(name=name).exists():
Copy link
Member

Choose a reason for hiding this comment

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

I think it's better to set the default unique error message for this field instead of adding a custom validation for this.

You can add this to the __init__ method:

self.fields['name'].error_messages['unique'] = _(
    "Organization with this name already exists.")

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Thanks for this @oliverroick. I've reworked it based on your recommendation so take another look and let me know if there is anything else I should change.

@oliverroick oliverroick requested a review from seav April 19, 2017 09:33
oliverroick
oliverroick approved these changes Apr 20, 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.

Looks good!

seav
seav approved these changes Apr 23, 2017
View reviewed changes
Copy link
Contributor

@seav seav left a comment

Choose a reason for hiding this comment

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

The changes look good and it works as advertised. 👍

clash99 added 2 commits April 24, 2017 13:24
@amplifi
Adding validation to translate to org duplicates
95fdc6c 
Change text

Add script to remove error block on submit if form not valid

Removed alert

Changed form_submit_once to form_submit
@amplifi
Moving duplicate error message to init
2ec9377
@amplifi amplifi mentioned this pull request Apr 24, 2017
Closed
@amplifi amplifi merged commit 6afd04a into master Apr 24, 2017
@amplifi amplifi deleted the bugfix/#1220 branch April 24, 2017 06:43
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@seav seav seav approved these changes

@oliverroick oliverroick oliverroick approved these changes

Assignees
No one assigned
Labels
PR: approved PR: bugfix
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@clash99 @oliverroick @seav @amplifi