From 0a04dcd23b4e9ef71586e131a646decee2a67061 Mon Sep 17 00:00:00 2001 From: simon Date: Thu, 12 Feb 2009 00:06:36 +0100 Subject: * added missing associations --- app/models/node.rb | 4 +++- app/models/permission.rb | 1 + app/models/user.rb | 5 +++++ 3 files changed, 9 insertions(+), 1 deletion(-) diff --git a/app/models/node.rb b/app/models/node.rb index 819acac..35904d4 100644 --- a/app/models/node.rb +++ b/app/models/node.rb @@ -1,10 +1,12 @@ class Node < ActiveRecord::Base + # Mixins and Plugins acts_as_nested_set # Associations has_many :pages, :order => "revision ASC" belongs_to :head, :class_name => "Page", :foreign_key => :head_id - + has_many :permissions + # Callbacks after_create :initialize_empty_page diff --git a/app/models/permission.rb b/app/models/permission.rb index 1070b7a..3914c9c 100644 --- a/app/models/permission.rb +++ b/app/models/permission.rb @@ -1,4 +1,5 @@ class Permission < ActiveRecord::Base + # Validations validates_presence_of :user_id, :node_id, :granted # Associations diff --git a/app/models/user.rb b/app/models/user.rb index 3ac0712..2bb4879 100644 --- a/app/models/user.rb +++ b/app/models/user.rb @@ -1,9 +1,14 @@ require 'digest/sha1' class User < ActiveRecord::Base + # Mixins and Plugins include Authentication include Authentication::ByPassword + # Associations + has_many :permissions + + # Validations validates_presence_of :login validates_length_of :login, :within => 3..40 validates_uniqueness_of :login -- cgit v1.3