Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix(users): remove blank params from user form #356

Merged
merged 4 commits into from
Nov 30, 2023
Merged

fix(users): remove blank params from user form #356

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
7cbf6db
fix(users): remove blank params from user form
wJoenn Nov 23, 2023
98febf3
fix(users): replace #compact_blank with before_validation
wJoenn Nov 30, 2023
75cd43a
Merge branch 'main' into fix/users/no-balnk-favourite-language
wJoenn Nov 30, 2023
ac26127
profile fail
wJoenn Nov 30, 2023
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
4 changes: 3 additions & 1 deletion app/controllers/users_controller.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -103,6 +103,8 @@ def unlock_achievements
end

def user_params
params.require(:user).permit(:accepted_coc, :aoc_id, :city_id, :entered_hardcore, :event_awareness, :favourite_language, :username)
params
.require(:user)
.permit(:accepted_coc, :aoc_id, :city_id, :entered_hardcore, :event_awareness, :favourite_language, :username)
end
end
8 changes: 8 additions & 0 deletions app/models/user.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,8 @@ class User < ApplicationRecord
validate :referrer_must_exist, on: :update, if: :referrer_id_changed?
validate :referrer_cannot_be_self, on: :update

before_validation :blank_language_to_nil

scope :admins, -> { where(uid: ADMINS.values) }
scope :confirmed, -> { where(accepted_coc: true, synced: true).where.not(aoc_id: nil) }
scope :insanity, -> { where(entered_hardcore: true) }
Expand Down Expand Up @@ -162,6 +164,12 @@ def batch_cannot_be_changed
errors.add(:batch, "can't be changed")
end

def blank_language_to_nil
return if favourite_language.present?

self.favourite_language = nil
end

def referrer_must_exist
errors.add(:referrer, "must exist") unless User.exists?(referrer_id)
end
Expand Down