Commit ff28c230 authored by Gualter's avatar Gualter

Remove subcategory join on user (#213)

parent 745a0b07
......@@ -73,11 +73,6 @@ class User < ActiveRecord::Base
'reviewer'.in? self.roles_in(conference)
end
def subcategories_assigned_to_in(conference)
Subcategory.joins(:conference_user_subcategories => :conference_user).where('conference_users.user_id' => self.id, 'conference_users.conference_id' => conference.id)
#self.conference_users.includes(:conference_user_subcategories).where('conference_users.conference_id' => conference.id)
end
def self.check_pentabarf_credentials(email, password)
user = User.find_by_email(email)
return unless user and user.pentabarf_password and user.pentabarf_salt
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment