gunghogeoduck/osem-fcy
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Added paper_trail, also starting work on the scheduler

Browse source
This commit is contained in:
Matt Barringer 2013-01-07 16:45:48 +01:00
parent 90b30db9e8
commit f86232bedf
35 changed files with 523 additions and 32137 deletions
Download patch file Download diff file Expand all files Collapse all files

7
app/models/person.rb
View file

@ -32,8 +32,9 @@ class Person < ActiveRecord::Base
:person_id => self.id).count
end
def proposals conference
self.events.where("conference_id = ? AND state != ? AND state != ?", conference.id, "withdrawn", "rejected")
self.events.where("conference_id = ? AND state != ? AND state != ? AND event_people.event_role=?", conference.id, "withdrawn", "rejected", "submitter")
end
def proposal_count conference
@ -48,6 +49,10 @@ class Person < ActiveRecord::Base
end
end
def self.find_person_by_user_id user_id
Person.where(:user_id => user_id).first
end
private
def biography_limit
if self.biography.split.size > 150