summaryrefslogtreecommitdiffstats
path: root/app/controllers/admin_controller.rb
diff options
context:
space:
mode:
authorToshi MARUYAMA <marutosijp2@yahoo.co.jp>2011-04-25 23:21:34 +0000
committerToshi MARUYAMA <marutosijp2@yahoo.co.jp>2011-04-25 23:21:34 +0000
commit6da0d5d366c64de438bf410e8ff496f3942e4f91 (patch)
treea4aa885859f6e149e5e114f6585f9e056626ad97 /app/controllers/admin_controller.rb
parentd1eb1fb07dd3d5fb7c42c38177c64992191bdd7e (diff)
downloadredmine-6da0d5d366c64de438bf410e8ff496f3942e4f91.tar.gz
redmine-6da0d5d366c64de438bf410e8ff496f3942e4f91.zip
code clean up AdminController.
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@5550 e93f8b46-1217-0410-a6f0-8f06a7374b81
Diffstat (limited to 'app/controllers/admin_controller.rb')
-rw-r--r--app/controllers/admin_controller.rb22
1 files changed, 10 insertions, 12 deletions
diff --git a/app/controllers/admin_controller.rb b/app/controllers/admin_controller.rb
index 2dc3ab1ca..52fe04144 100644
--- a/app/controllers/admin_controller.rb
+++ b/app/controllers/admin_controller.rb
@@ -17,9 +17,7 @@
class AdminController < ApplicationController
layout 'admin'
-
before_filter :require_admin
-
helper :sort
include SortHelper
@@ -30,22 +28,20 @@ class AdminController < ApplicationController
def projects
@status = params[:status] ? params[:status].to_i : 1
c = ARCondition.new(@status == 0 ? "status <> 0" : ["status = ?", @status])
-
unless params[:name].blank?
name = "%#{params[:name].strip.downcase}%"
c << ["LOWER(identifier) LIKE ? OR LOWER(name) LIKE ?", name, name]
end
-
@projects = Project.find :all, :order => 'lft',
:conditions => c.conditions
render :action => "projects", :layout => false if request.xhr?
end
-
+
def plugins
@plugins = Redmine::Plugin.all
end
-
+
# Loads the default configuration
# (roles, trackers, statuses, workflow, enumerations)
def default_configuration
@@ -59,7 +55,7 @@ class AdminController < ApplicationController
end
redirect_to :action => 'index'
end
-
+
def test_email
raise_delivery_errors = ActionMailer::Base.raise_delivery_errors
# Force ActionMailer to raise delivery errors so we can catch it
@@ -73,14 +69,16 @@ class AdminController < ApplicationController
ActionMailer::Base.raise_delivery_errors = raise_delivery_errors
redirect_to :controller => 'settings', :action => 'edit', :tab => 'notifications'
end
-
+
def info
@db_adapter_name = ActiveRecord::Base.connection.adapter_name
@checklist = [
- [:text_default_administrator_account_changed, User.find(:first, :conditions => ["login=? and hashed_password=?", 'admin', User.hash_password('admin')]).nil?],
+ [:text_default_administrator_account_changed,
+ User.find(:first,
+ :conditions => ["login=? and hashed_password=?", 'admin', User.hash_password('admin')]).nil?],
[:text_file_repository_writable, File.writable?(Attachment.storage_path)],
- [:text_plugin_assets_writable, File.writable?(Engines.public_directory)],
- [:text_rmagick_available, Object.const_defined?(:Magick)]
+ [:text_plugin_assets_writable, File.writable?(Engines.public_directory)],
+ [:text_rmagick_available, Object.const_defined?(:Magick)]
]
- end
+ end
end