Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 5 additions & 1 deletion app/controllers/concerns/workshop_invitation_concerns.rb
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,11 @@ module InstanceMethods
private

def invitation_params
params[:workshop_invitation].present? ? params.require(:workshop_invitation).permit(:tutorial, :note) : {}
if params.key?(:workshop_invitation)
params.expect(workshop_invitation: [:tutorial, :note])
else
{}
end
end

def back_with_message(message)
Expand Down
2 changes: 1 addition & 1 deletion app/controllers/contact_preferences_controller.rb
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ def token
end

def contact_preferences
params.require(:contact).permit(:token, :mailing_list_consent)
params.expect(contact: [:token, :mailing_list_consent])
end

def mailing_list_consent
Expand Down
2 changes: 1 addition & 1 deletion app/controllers/feedback_controller.rb
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ def submit
private

def feedback_params
params.require(:feedback).permit(:coach_id, :tutorial_id, :request, :rating, :suggestions)
params.expect(feedback: [:coach_id, :tutorial_id, :request, :rating, :suggestions])
end

def set_coaches(workshop)
Expand Down
6 changes: 5 additions & 1 deletion app/controllers/invitation_controller.rb
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,11 @@ def update
private

def invitation_params
params[:workshop_invitation].present? ? params.require(:workshop_invitation).permit(:tutorial, :note) : {}
if params.key?(:workshop_invitation)
params.expect(workshop_invitation: [:tutorial, :note])
else
{}
end
end

def available_spaces?(workshop, invitation)
Expand Down
2 changes: 1 addition & 1 deletion app/controllers/subscriptions_controller.rb
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ def destroy
private

def group_id
params.require(:subscription).permit(:group_id)[:group_id]
params.expect(subscription: [:group_id])[:group_id]
end

def send_welcome_email(member, subscription)
Expand Down
2 changes: 1 addition & 1 deletion app/controllers/terms_and_conditions_controller.rb
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,6 @@ def update
private

def terms_params
params.require(:terms_and_conditions_form).permit(:terms)
params.expect(terms_and_conditions_form: [:terms])
end
end