Adds Redmine::Plugin.public_directory to be used instead of Engines.public_directory.
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@9065 e93f8b46-1217-0410-a6f0-8f06a7374b81
This commit is contained in:
parent
c474d59b0b
commit
c7b1a42d19
|
@ -79,7 +79,7 @@ class AdminController < ApplicationController
|
||||||
User.find(:first,
|
User.find(:first,
|
||||||
:conditions => ["login=? and hashed_password=?", 'admin', User.hash_password('admin')]).nil?],
|
:conditions => ["login=? and hashed_password=?", 'admin', User.hash_password('admin')]).nil?],
|
||||||
[:text_file_repository_writable, File.writable?(Attachment.storage_path)],
|
[:text_file_repository_writable, File.writable?(Attachment.storage_path)],
|
||||||
[:text_plugin_assets_writable, File.writable?(Engines.public_directory)],
|
[:text_plugin_assets_writable, File.writable?(Redmine::Plugin.public_directory)],
|
||||||
[:text_rmagick_available, Object.const_defined?(:Magick)]
|
[:text_rmagick_available, Object.const_defined?(:Magick)]
|
||||||
]
|
]
|
||||||
end
|
end
|
||||||
|
|
|
@ -43,6 +43,9 @@ module Redmine #:nodoc:
|
||||||
#
|
#
|
||||||
# When rendered, the plugin settings value is available as the local variable +settings+
|
# When rendered, the plugin settings value is available as the local variable +settings+
|
||||||
class Plugin
|
class Plugin
|
||||||
|
cattr_accessor :public_directory
|
||||||
|
self.public_directory = File.join(Rails.root, 'public', 'plugin_assets')
|
||||||
|
|
||||||
@registered_plugins = {}
|
@registered_plugins = {}
|
||||||
class << self
|
class << self
|
||||||
attr_reader :registered_plugins
|
attr_reader :registered_plugins
|
||||||
|
|
Loading…
Reference in New Issue