Added the states column in the participants view #92
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
nikhilgupta1211
force-pushed
the
participatnsstate
branch
from
d9d755b
to
e7fc87a
Compare
|
|
nikhilgupta1211
force-pushed
the
participatnsstate
branch
from
e7fc87a
to
e756d37
Compare
nikhilgupta1211
force-pushed
the
participatnsstate
branch
from
e756d37
to
587dec5
Compare
ChrisBr
requested changes
Aug 9, 2017
| @@ -16,4 +16,19 @@ def users_for_event(state) | |||
| requests = requests.where(state: state) if state != 'all' | |||
| requests.distinct.pluck('users.email') | |||
| end | |||
|
|
|||
| def state_label(state) | |||
There was a problem hiding this comment.
Just return the css class and do the rest in the view because it is always the same
| @@ -10,7 +10,7 @@ def participants | |||
| { label: @event.name, url: event_path(@event) }, | |||
| { label: 'participants' } | |||
| ] | |||
| @requests = @event.travel_sponsorships.includes(:user).select(:user_id).distinct.accessible_by(current_ability) | |||
| @requests = @event.travel_sponsorships.includes(:user).group(:user_id).accessible_by(current_ability) | |||
There was a problem hiding this comment.
In the previous query we are only selecting the user_id from a request for distinct requests if we also select state here then the requests will not be distinct, also group returns the latest request of the user(active request) I don't know if distinct also do the same.
nikhilgupta1211
force-pushed
the
participatnsstate
branch
from
587dec5
to
2e76ce8
Compare
ChrisBr
reviewed
Aug 14, 2017
app/helpers/events_helper.rb
Outdated
| def state_label(state) | ||
| case state | ||
| when 'submitted' | ||
| 'label label-primary' |
There was a problem hiding this comment.
label could also go to the view
nikhilgupta1211
force-pushed
the
participatnsstate
branch
from
2e76ce8
to
2f2fc0c
Compare
ChrisBr
approved these changes
Aug 14, 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.
A person can only have a single active request for an event. The State column shows the state of the active request of a user.