2400 next eventful period #2438
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
ivan-kocienski-gfsc
suggested changes
Apr 25, 2024
app/controllers/events_controller.rb
Outdated
| @@ -28,6 +28,18 @@ def index | |||
| @events = sort_events(@events, @sort) | |||
| @multiple_days = true | |||
|
|
|||
| @next = if params[:year] | |||
There was a problem hiding this comment.
maybe params[:year].present? ?
| @@ -24,5 +24,5 @@ | |||
| </ol> | |||
| <% end %> | |||
| <% else %> | |||
| <p>No events with this selection.</p> | |||
| <p>No events with this selection.<% if @next.present? %> <a href=<%= next_url(@next, period, sort, repeating)%>>skip to next date with events</a>.<% end %></p> | |||
There was a problem hiding this comment.
I think this should be a link_to
so something like
<%= link_to 'skip to next date with events', next_url(@next) if @next.present? %>
app/helpers/events_helper.rb
Outdated
| @@ -35,4 +35,13 @@ def online_link | |||
| def html_to_plaintext(input) | |||
| Nokogiri::HTML.fragment(input).text | |||
| end | |||
|
|
|||
| def next_url(next_event, period, sort, repeating) | |||
| opts = [] | |||
There was a problem hiding this comment.
building URLs like this seems very un-railsy as it has some hard-coded strings in it
it would be better to use a named route (like how there's an events_path) so if the routing changes we don't get caught out with old-style routes.
unfortunately you'll have to modify the route file to give that path a name.
In config/routes.rb you'll want to
get '/events/:year/:month/:day' => 'events#index', constraints: ymd
# and add at the end to be
get '/events/:year/:month/:day' => 'events#index', constraints: ymd, as: :events_by_dateThen the URL can be built with
def next_url(next_event)
opts = {
year: next_event.dtstart.year,
month: next_event.dtstart.month,
day: next_event.dtstart.day,
anchor: 'paginator',
period: @period,
sort: @sort,
repeating: @repeating
}.keep_if { |_key, value| value.present? }
events_by_date_path(opts)
end
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.
fixes #2400
Grabs the next future event, takes it's start date and links to it using the same logic as the paginator. Retains "period" mode and won't show if there's no future events.
next_date.mp4