fix: Hound issues v1

Author: cbaudouinjr

app/controllers/manage/application_controller.rb

@@ -9,12 +9,12 @@ def logged_in
   end
 
   def require_director
-    return redirect_to manage_root_path if current_user.staff? unless current_user.try(:director?)
+    return redirect_to manage_root_path unless !current_user.staff? || current_user.try(:director?)
     return redirect_to root_path unless current_user.try(:director?)
   end
 
   def require_director_or_organizer
-    return redirect_to manage_root_path if current_user.staff? unless current_user.try(:director?) || current_user.try(:organizer?)
+    return redirect_to manage_root_path unless !current_user.staff? || current_user.try(:director?) || current_user.try(:organizer?)
     return redirect_to root_path unless current_user.try(:director?) || current_user.try(:organizer?)
   end
 

app/models/user.rb

@@ -57,11 +57,11 @@ def full_name
   end
 
   def staff?
-    self.director? || self.organizer? || self.volunteer?
+    director? || organizer? || volunteer?
   end
 
   def organizing_staff?
-    self.director? || self.organizer?
+    director? || organizer?
   end
 
   def self.from_omniauth(auth)

test/models/user_test.rb

@@ -90,7 +90,7 @@ class UserTest < ActiveSupport::TestCase
       user = create(:user, role: :volunteer)
       assert_equal true, user.staff?
     end
-    
+
     should "report organizer as staff" do
       user = create(:user, role: :organizer)
       assert_equal true, user.staff?
@@ -112,7 +112,7 @@ class UserTest < ActiveSupport::TestCase
       user = create(:user, role: :volunteer)
       assert_equal false, user.organizing_staff?
     end
-    
+
     should "report organizer as organizing staff" do
       user = create(:user, role: :organizer)
       assert_equal true, user.organizing_staff?