Skip to content

fix: Fixes various Hound issues for 2.0 #370

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

Merged
cbaudouinjr merged 2 commits into from
Sep 21, 2020
Merged

fix: Fixes various Hound issues for 2.0 #370

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
6328c7d
fix: Fixes Hound issues (1/6)
cbaudouinjr Sep 21, 2020
82bb357
fix: Additional Hound issues
cbaudouinjr Sep 21, 2020
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
2 changes: 1 addition & 1 deletion app/controllers/rsvps_controller.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@ def update
bus_after_rsvp = @questionnaire.bus_list_id
acc_status_after_rsvp = @questionnaire.acc_status

if bus != nil && (acc_status != acc_status_after_rsvp || bus != bus_after_rsvp) && @questionnaire.is_bus_captain == true
if !bus.nil? && (acc_status != acc_status_after_rsvp || bus != bus_after_rsvp) && @questionnaire.is_bus_captain == true
@questionnaire.is_bus_captain = false
directors = User.where(role: :director)
directors.each do |user|
Expand Down
7 changes: 2 additions & 5 deletions db/migrate/20200525234832_move_user_info_from_questionnaire_to_user_model.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,13 +1,11 @@
class MoveUserInfoFromQuestionnaireToUserModel < ActiveRecord::Migration[5.2]

# See the "Hackathon Manager 2.0 Migration Guide"
# for a more general description of what this migration does.

# Effectively, we move the `first_name` and `last_name` columns
# from the questionnares table to the users table (and model, for both).

def up

# Add the first/last name columns to the users table
add_column :users, :first_name, :string
add_column :users, :last_name, :string
Expand All @@ -26,7 +24,7 @@ def up
email_head = u.email.partition('@').first
u.first_name = email_head
u.last_name = email_head
u.save()
u.save
end

# Remove the first/last name columns from the questionnaires table
Expand All @@ -35,7 +33,6 @@ def up
end

def down

# Add the first/last name columns back to the questionnaires table
add_column :questionnaires, :first_name, :string
add_column :questionnaires, :last_name, :string
Expand All @@ -48,7 +45,7 @@ def down
# and set both their first/last name to nil.
User.all.each do |u|
email_head = u.email.partition('@').first
if u.first_name == email_head and u.last_name == email_head
if u.first_name == email_head && u.last_name == email_head
u.first_name = nil
u.last_name = nil
end
Expand Down