Fix bug where school doesn't show up in PD auto emails. #16794
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
added 2 commits
August 3, 2017 17:15
aoby
force-pushed
the
pd-enrollment-school
branch
from
ea6545d
to
d03f590
Compare
|
In the process I cleaned up some of the enrollment validations, moving toward allowing old enrollments with old rules to be grandfathered in and validating new ones more strictly. I also added a default |
aoby
commented
Aug 4, 2017
| @@ -6,7 +6,6 @@ class Api::V1::Pd::WorkshopEnrollmentsControllerTest < ::ActionController::TestC | |||
| @facilitator = create :facilitator | |||
|
|
|||
| @workshop = create :pd_workshop, organizer: @organizer, facilitators: [@facilitator] | |||
| @school_info = create :school_info_without_country | |||
mehalshah
approved these changes
Aug 4, 2017
| @@ -222,6 +221,19 @@ def self.get_safe_names | |||
| all.map {|enrollment| [enrollment.full_name, enrollment]} | |||
| end | |||
|
|
|||
| # TODO: Delete school column | |||
| def school | |||
| ActiveSupport::Deprecation.warn('School is deprecated. Use school_info or school_name instead.') | |||
There was a problem hiding this comment.
You should still return school here for now
ewjordan
reviewed
Aug 4, 2017
| @@ -222,6 +221,19 @@ def self.get_safe_names | |||
| all.map {|enrollment| [enrollment.full_name, enrollment]} | |||
| end | |||
|
|
|||
| # TODO: Delete school column | |||
There was a problem hiding this comment.
We just need to make sure that getting rid of the column waits on making use of the existing school data (which is on my plate soon)
ewjordan
approved these changes
Aug 4, 2017
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Add helper methods and tests.
Bug
Now, the mail preview looks like this:
