diff options
author | Jean-Philippe Lang <jp_lang@yahoo.fr> | 2007-03-10 15:09:49 +0000 |
---|---|---|
committer | Jean-Philippe Lang <jp_lang@yahoo.fr> | 2007-03-10 15:09:49 +0000 |
commit | c514316a2efcf4e8df4bc2f2681548ebffa30adf (patch) | |
tree | b9b7bc9ccbbbad1cce2701430788f4dfbf872610 /app/models/project.rb | |
parent | 8b98ceb92c8fba72315d28c3b7664f481547bf24 (diff) | |
download | redmine-c514316a2efcf4e8df4bc2f2681548ebffa30adf.tar.gz redmine-c514316a2efcf4e8df4bc2f2681548ebffa30adf.zip |
wiki branch merged into trunk
git-svn-id: http://redmine.rubyforge.org/svn/trunk@323 e93f8b46-1217-0410-a6f0-8f06a7374b81
Diffstat (limited to 'app/models/project.rb')
-rw-r--r-- | app/models/project.rb | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/app/models/project.rb b/app/models/project.rb index e36100dcf..3f9ec1680 100644 --- a/app/models/project.rb +++ b/app/models/project.rb @@ -26,13 +26,14 @@ class Project < ActiveRecord::Base has_many :news, :dependent => :delete_all, :include => :author
has_many :issue_categories, :dependent => :delete_all, :order => "issue_categories.name"
has_one :repository, :dependent => :destroy
+ has_one :wiki, :dependent => :destroy
has_and_belongs_to_many :custom_fields, :class_name => 'IssueCustomField', :join_table => 'custom_fields_projects', :association_foreign_key => 'custom_field_id'
acts_as_tree :order => "name", :counter_cache => true
validates_presence_of :name, :description
validates_uniqueness_of :name
validates_associated :custom_values, :on => :update
- validates_associated :repository
+ validates_associated :repository, :wiki
validates_format_of :name, :with => /^[\w\s\'\-]*$/i
# returns latest created projects
|