Skip to content

Commit

Permalink
Merge branch 'release/2.0.1'
Browse files Browse the repository at this point in the history
  • Loading branch information
jmalcic committed Apr 16, 2021
2 parents 5351edb + ddad497 commit 86e1d6b
Show file tree
Hide file tree
Showing 20 changed files with 20 additions and 11 deletions.
2 changes: 1 addition & 1 deletion Gemfile.lock
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
PATH
remote: .
specs:
spina-admin-conferences (2.0.0)
spina-admin-conferences (2.0.1)
icalendar (~> 2.5)
rails (~> 6.0)
rails-i18n (~> 6.0)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ class ConferencesController < ApplicationController
# Renders a list of conferences.
# @return [void]
def index
@conferences = Conference.sorted
@conferences = Conference.sorted.page(params[:page])
end

# Renders a form for a new conference.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ class DelegatesController < ApplicationController
# Renders a list of delegates.
# @return [void]
def index
@delegates = Delegate.sorted
@delegates = Delegate.sorted.page(params[:page])
end

# Renders a form for a new delegate.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ class DietaryRequirementsController < ApplicationController
# Renders a list of dietary requirements.
# @return [void]
def index
@dietary_requirements = DietaryRequirement.sorted
@dietary_requirements = DietaryRequirement.sorted.page(params[:page])
end

# Renders a form for a new dietary requirement.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ class InstitutionsController < ApplicationController
# Renders a list of institutions.
# @return [void]
def index
@institutions = Institution.sorted
@institutions = Institution.sorted.page(params[:page])
end

# Renders a form for a new institution.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ class PresentationAttachmentTypesController < ApplicationController
# Renders a list of presentation attachment types.
# @return [void]
def index
@presentation_attachment_types = PresentationAttachmentType.sorted
@presentation_attachment_types = PresentationAttachmentType.sorted.page(params[:page])
end

# Renders a form for a new presentation attachment type.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ class PresentationTypesController < ApplicationController
# Renders a list of presentation types.
# @return [void]
def index
@presentation_types = PresentationType.sorted
@presentation_types = PresentationType.sorted.page(params[:page])
end

# Renders a form for a new presentation type.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ class PresentationsController < ApplicationController
# Renders a list of presentations.
# @return [void]
def index
@presentations = Presentation.sorted
@presentations = Presentation.sorted.page(params[:page])
end

# Renders a form for a new presentation.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ class RoomsController < ApplicationController
# Renders a list of rooms.
# @return [void]
def index
@rooms = Room.sorted
@rooms = Room.sorted.page(params[:page])
end

# Renders a form for a new room.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ class SessionsController < ApplicationController
# Renders a list of sessions.
# @return [void]
def index
@sessions = Session.all
@sessions = Session.all.page(params[:page])
end

# Renders a form for a new session.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,3 +4,4 @@
= t '.new'

= render partial: 'conferences', object: @conferences
= link_to_next_page @conferences, 'Next'
Original file line number Diff line number Diff line change
Expand Up @@ -10,3 +10,4 @@
= t '.new'

= render partial: 'delegates', object: @delegates
= link_to_next_page @delegates, 'Next'
Original file line number Diff line number Diff line change
Expand Up @@ -4,3 +4,4 @@
= t '.new'

= render partial: 'dietary_requirements', object: @dietary_requirements
= link_to_next_page @dietary_requirements, 'Next'
Original file line number Diff line number Diff line change
Expand Up @@ -4,3 +4,4 @@
= t '.new'

= render partial: 'institutions', object: @institutions
= link_to_next_page @institutions, 'Next'
Original file line number Diff line number Diff line change
Expand Up @@ -4,3 +4,4 @@
= t '.new'

= render partial: 'presentation_attachment_types', object: @presentation_attachment_types
= link_to_next_page @presentation_attachment_types, 'Next'
Original file line number Diff line number Diff line change
Expand Up @@ -4,3 +4,4 @@
= t '.new'

= render partial: 'presentation_types', object: @presentation_types
= link_to_next_page @presentation_types, 'Next'
Original file line number Diff line number Diff line change
Expand Up @@ -10,3 +10,4 @@
= t '.new'

= render partial: 'presentations', object: @presentations
= link_to_next_page @presentations, 'Next'
1 change: 1 addition & 0 deletions app/views/spina/admin/conferences/rooms/index.html.haml
Original file line number Diff line number Diff line change
Expand Up @@ -4,3 +4,4 @@
= t '.new'

= render partial: 'rooms', object: @rooms
= link_to_next_page @rooms, 'Next'
1 change: 1 addition & 0 deletions app/views/spina/admin/conferences/sessions/index.html.haml
Original file line number Diff line number Diff line change
Expand Up @@ -4,3 +4,4 @@
= t '.new'

= render partial: 'sessions', object: @sessions
= link_to_next_page @sessions, 'Next'
2 changes: 1 addition & 1 deletion lib/spina/admin/conferences/version.rb
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ module Spina
module Admin
module Conferences
# Version number.
VERSION = '2.0.0'
VERSION = '2.0.1'
end
end
end

0 comments on commit 86e1d6b

Please sign in to comment.