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

Cfpwordingfix fixes #228

Merged
merged 4 commits into from
Mar 29, 2018
Merged

Cfpwordingfix fixes #228

merged 4 commits into from
Mar 29, 2018

Conversation

PirosB3
Copy link

@PirosB3 PirosB3 commented Mar 29, 2018 •
edited
Loading

Changes made:

  • renamed field from category to theme in various places (unit tests, email body, form validation)
  • added sqlparse
  • updated SQL schema to be more flexible (validation is done on the application layer)
  • fixed a bug with emails not being sent because of relative path handling

BethanyG
BethanyG approved these changes Mar 29, 2018
View reviewed changes
Copy link
Collaborator

@BethanyG BethanyG 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 - we need to make one addition to proposals/forms.py to have the phone number save to the DB correctly. I will do that after merging your changes.

@BethanyG BethanyG merged commit faf3424 into cfpwordingfix Mar 29, 2018
@BethanyG BethanyG deleted the cfpwordingfix_fixes branch March 29, 2018 10:56
BethanyG added a commit that referenced this pull request Mar 30, 2018
@BethanyG
Altered wording of first cfp category to Python Fundamentals & Popula…
8cdff62 
…r Libraries (#227)

* Altered wording of first cfp category.  Changed category field name to 'Themes' & added field note about multi-select.

* Cleaned up unecessary crispyforms imports from forms file.

* Altered db field from category to themes to match form field.  Altered tests and made migration accordinly.

* Cfpwordingfix fixes (#228)

* added fixes

* fixed

* Ignore NOT NULL clause

* added SQL parse

* Changed forms.py so that the phone field will be saved to the DB.

* Added phone field to admin interface. Changed model to bypass strict validation for theme multi-slect in admin interface.

* Removed unneeded variable and import statement from admin.py.

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

@BethanyG BethanyG BethanyG approved these changes

@simeonf simeonf Awaiting requested review from simeonf

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@PirosB3 @BethanyG