Merged r6098 from trunk.

Added Project#enable_module! and Project#disable_module! git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/1.2-stable@6104 e93f8b46-1217-0410-a6f0-8f06a7374b81
2011-06-20 19:39:59 +00:00
parent df37e5cfab
commit 16ba6bcb77
18 changed files with 131 additions and 60 deletions
@@ -43,7 +43,7 @@ class Attachment < ActiveRecord::Base
                                                        "LEFT JOIN #{Project.table_name} ON #{Document.table_name}.project_id = #{Project.table_name}.id"}

  cattr_accessor :storage_path
-  @@storage_path = Redmine::Configuration['attachments_storage_path'] || "#{RAILS_ROOT}/files"
+  @@storage_path = Redmine::Configuration['attachments_storage_path'] || "#{Rails.root}/files"

  def validate
    if self.filesize > Setting.attachment_max_size.to_i.kilobytes