Skip to content

Commit 274787f

Browse files
committed
refactor: Renames event_tracking to Volunteer
1 parent 873e43c commit 274787f

File tree

8 files changed

+10
-10
lines changed

8 files changed

+10
-10
lines changed

app/controllers/manage/application_controller.rb

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
class Manage::ApplicationController < ApplicationController
22
before_action :logged_in
3-
before_action :require_director_or_organizer_or_event_tracking
3+
before_action :require_director_or_organizer_or_volunteer
44
before_action :limit_write_access_to_directors, only: ["edit", "update", "new", "create", "destroy", "convert_to_admin", "deliver", "merge", "perform_merge", "toggle_bus_captain", "duplicate", "update_acc_status", "send_update_email", "live_preview"]
55
skip_before_action :verify_authenticity_token, if: :json_request?
66

@@ -16,8 +16,8 @@ def require_director_or_organizer
1616
return redirect_to root_path unless current_user.try(:director?) || current_user.try(:organizer?)
1717
end
1818

19-
def require_director_or_organizer_or_event_tracking
20-
redirect_to root_path unless current_user.try(:director?) || current_user.try(:organizer?) || current_user.try(:event_tracking?)
19+
def require_director_or_organizer_or_volunteer
20+
redirect_to root_path unless current_user.try(:director?) || current_user.try(:organizer?) || current_user.try(:volunteer?)
2121
end
2222

2323
def limit_write_access_to_directors

app/controllers/manage/users_controller.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ class Manage::UsersController < Manage::ApplicationController
55
respond_to :html, :json
66

77
def index
8-
respond_with(:manage, User.where(role: [:director, :organizer, :event_tracking]))
8+
respond_with(:manage, User.where(role: [:director, :organizer, :volunteer]))
99
end
1010

1111
def user_datatable

app/datatables/staff_datatable.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,6 @@ def data
4343
end
4444

4545
def get_raw_records
46-
User.where(role: [:director, :organizer, :event_tracking])
46+
User.where(role: [:director, :organizer, :volunteer])
4747
end
4848
end

app/models/user.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ class User < ApplicationRecord
2323
after_create :queue_reminder_email
2424
after_initialize :set_default_role, if: :new_record?
2525

26-
enum role: { user: 0, event_tracking: 1, organizer: 2, director: 3 }
26+
enum role: { user: 0, volunteer: 1, organizer: 2, director: 3 }
2727

2828
def set_default_role
2929
self.role ||= :user

test/controllers/manage/checkins_controller_test.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ class Manage::CheckinsControllerTest < ActionController::TestCase
5353
end
5454

5555
limited_conditions = {
56-
'event tracking user' => :event_tracking,
56+
'volunteer' => :volunteer,
5757
}
5858

5959
limited_conditions.each do |condition_name, user_role|

test/controllers/manage/trackable_events_controller_test.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ class Manage::TrackableEventsControllerTest < ActionController::TestCase
5252
end
5353

5454
limited_conditions = {
55-
'event tracking user' => :event_tracking,
55+
'volunteer' => :volunteer,
5656
'organizer' => :organizer
5757
}
5858

test/controllers/manage/trackable_tags_controller_test.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ class Manage::TrackableTagsControllerTest < ActionController::TestCase
5151
end
5252

5353
limited_conditions = {
54-
'event tracking user' => :event_tracking,
54+
'volunteer' => :volunteer,
5555
'organizer' => :organizer
5656
}
5757

test/models/user_test.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ class UserTest < ActiveSupport::TestCase
6666

6767
should "not return staff" do
6868
create(:questionnaire) # user, has questionnaire
69-
create(:user, role: :event_tracking) # user, does not
69+
create(:user, role: :volunteer) # volunteer, does not
7070
create(:user, role: :organizer) # organizer, does not
7171
create(:user, role: :director) # director, does not
7272
assert_equal 4, User.count

0 commit comments

Comments
 (0)