Loading app/models/user.rb +0 −5 Original line number Diff line number Diff line Loading @@ -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 Loading Loading
app/models/user.rb +0 −5 Original line number Diff line number Diff line Loading @@ -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 Loading