fix camp selection content fixes #652 #782
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
shaniqwa
added a commit
that referenced
this pull request
Mar 23, 2018
* midburn/master: fix camp selection content (#782) continuous deployment from api-refactor-feb-2018 to sparktesting environment (#770) enable continuous deployment for spark-drupal-sync (#763) Sorting using ng-repeat filter sortBy (#741) Tagging v2.10.30 Update package.json fixed incorrect tickets number displayed (#739) Fixed for unsynced tickets (#737) Fixed code in free text in the camp page (#713) (#736) Fix ticket sync from Drupal (#734) Tagging v2.10.27 update docs for import pre sale ticket allocations (#732) Ui style improvment and fixes (#733) Ui Bugs fixed: #708, #710, #711, #712 (#726) bumping version to v2.10.26 Bundle IDs should be int, not string (#729) Added correct bundle IDs for 2018 sale (#727) # Conflicts: # public/stylesheets/_camps.scss # public/stylesheets/_colors.scss # public/stylesheets/main.scss # views/includes/page.jade # views/pages/camps/index_user.jade
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.
Proposed solution
use filteredCamps array to filter camp types from selection in appropriate places (user-admin and index-admin)
Tradeoffs
none
Testing Done
compare to db, change year and languages