##// END OF EJS Templates
jro_apps » redmine
RSS
Adds Redmine::Plugin.public_directory to be used instead of Engines.public_directory....
Jean-Philippe Lang -
r8945:c7b1a42d19f0
parent child
Show More
Side by Side Unified
Context file:
r8945:c7b1a42d19f0 Loading diff...:
Show file before | Show file after | Hide comments
@@ -79,7 +79,7 class AdminController < ApplicationController
79 User.find(:first,
79 User.find(:first,
80 :conditions => ["login=? and hashed_password=?", 'admin', User.hash_password('admin')]).nil?],
80 :conditions => ["login=? and hashed_password=?", 'admin', User.hash_password('admin')]).nil?],
81 [:text_file_repository_writable, File.writable?(Attachment.storage_path)],
81 [:text_file_repository_writable, File.writable?(Attachment.storage_path)],
82 [:text_plugin_assets_writable, File.writable?(Engines.public_directory)],
82 [:text_plugin_assets_writable, File.writable?(Redmine::Plugin.public_directory)],
83 [:text_rmagick_available, Object.const_defined?(:Magick)]
83 [:text_rmagick_available, Object.const_defined?(:Magick)]
84 ]
84 ]
85 end
85 end
Show file before | Show file after | Hide comments
@@ -43,6 +43,9 module Redmine #:nodoc:
43 #
43 #
44 # When rendered, the plugin settings value is available as the local variable +settings+
44 # When rendered, the plugin settings value is available as the local variable +settings+
45 class Plugin
45 class Plugin
46 cattr_accessor :public_directory
47 self.public_directory = File.join(Rails.root, 'public', 'plugin_assets')
48
46 @registered_plugins = {}
49 @registered_plugins = {}
47 class << self
50 class << self
48 attr_reader :registered_plugins
51 attr_reader :registered_plugins
General Comments 0
You need to be logged in to leave comments. Login now