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 for bug: No error notification on adding a skill multiple times #321

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Fix for bug: No error notification on adding a skill multiple times #321

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
43 changes: 36 additions & 7 deletions app/controllers/skills_controller.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,18 +8,47 @@ def create
else
skill_names = params[:skill][:name].split(",")
end
correct_skill_names = []
invalid_skill_names = []
duplicate_skill_names = []
added_skill_names = []
skill_names.each do |skill_name|
skill_name = ActionController::Base.helpers.sanitize(skill_name)
skill = @user.add_skill(skill_name)
unless skill.nil?
correct_skill_names << skill.name
duplicate = false
if @user.skill_for(skill_name)
duplicate = true
duplicate_skill_names << skill_name
end
skill = @user.add_skill(skill_name)
if !skill.nil?
if !duplicate
added_skill_names << skill.name
end
else
invalid_skill_names << skill_name
end
end
if correct_skill_names.blank?
flash[:error] = "Hmm...couldn't recognize '#{skill_names.flatten.join(',')}'"
empty_input_msg = "Hmm...couldn't recognize '#{skill_names.flatten.join(',')}'."
invalid_msg = "Hmm...couldn't recognize '#{invalid_skill_names.flatten.join(',')}'."
duplicate_msg = "Oops, you've already added #{duplicate_skill_names.flatten.join(' and ')} to your skills."
added_msg = "Whoa...you're good at #{added_skill_names.to_sentence}? Awesome!"
if added_skill_names.blank?
if duplicate_skill_names.blank? && invalid_skill_names.blank?
flash[:error] = empty_input_msg
elsif !duplicate_skill_names.blank? && !invalid_skill_names.blank?
flash[:error] = duplicate_msg + " " + invalid_msg
elsif !duplicate_skill_names.blank?
flash[:error] = duplicate_msg
else
flash[:error] = invalid_msg
end
else
flash[:notice] = "Whoa...you're good at #{correct_skill_names.to_sentence}? Awesome!"
flash[:notice] = added_msg
if !duplicate_skill_names.blank?
flash[:notice] += " " + duplicate_msg
end
if !invalid_skill_names.blank?
flash[:notice] += " " + invalid_msg
end
end
redirect_to(badge_url(username: @user.username))
end
Expand Down