Foodsoft/foodsoft
1
1
Fork 0
Code Issues 36 Pull requests 5 Projects 1 Releases Wiki Activity

Fixed broken links in tasks-module. Translated some views into german.

Browse source
This commit is contained in:
Benjamin Meichsner 2009-02-06 20:51:14 +01:00
parent 85eb27079f
commit 96442477d1
24 changed files with 141 additions and 274 deletions
Download patch file Download diff file Expand all files Collapse all files

3
app/models/task.rb
View file

@ -20,7 +20,8 @@ class Task < ActiveRecord::Base
has_many :users, :through => :assignments
belongs_to :workgroup
named_scope :non_group, :conditions => { :workgroup_id => nil, :done => false }, :order => "due_date ASC"
named_scope :non_group, :conditions => { :workgroup_id => nil, :done => false }
named_scope :done, :conditions => {:done => true}, :order => "due_date ASC"
# form will send user in string. responsibilities will added later
attr_protected :users

4
app/models/user.rb
View file

@ -181,8 +181,8 @@ class User < ActiveRecord::Base
end
# returns true if user is a member of a given group
def is_member_of(group)
return true if group.users.detect {|user| user == self}
def member_of?(group)
group.users.exists?(self.id)
end
#Returns an array with the users groups (but without the Ordergroups -> because tpye=>"")