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

Merge branch 'wiki'

Browse source
This commit is contained in:
Benjamin Meichsner 2009-08-15 17:24:08 +02:00
commit e75a42d509
146 changed files with 6300 additions and 261 deletions
Download patch file Download diff file Expand all files Collapse all files

3
app/models/user.rb
View file

@ -2,7 +2,7 @@
#
# Table name: users
#
# id :integer(4) not null, primary key
# id :integer not null, primary key
# nick :string(255) default(""), not null
# password_hash :string(255) default(""), not null
# password_salt :string(255) default(""), not null
@ -28,6 +28,7 @@ class User < ActiveRecord::Base
has_many :assignments, :dependent => :destroy
has_many :tasks, :through => :assignments
has_many :send_messages, :class_name => "Message", :foreign_key => "sender_id"
has_many :pages, :foreign_key => 'updated_by'
attr_accessor :password, :setting_attributes