##// END OF EJS Templates
code clean up AdminController....
Toshi MARUYAMA -
r5430:6da0d5d366c6
parent child
Show More
@@ -17,9 +17,7
17
17
18 class AdminController < ApplicationController
18 class AdminController < ApplicationController
19 layout 'admin'
19 layout 'admin'
20
21 before_filter :require_admin
20 before_filter :require_admin
22
23 helper :sort
21 helper :sort
24 include SortHelper
22 include SortHelper
25
23
@@ -30,22 +28,20 class AdminController < ApplicationController
30 def projects
28 def projects
31 @status = params[:status] ? params[:status].to_i : 1
29 @status = params[:status] ? params[:status].to_i : 1
32 c = ARCondition.new(@status == 0 ? "status <> 0" : ["status = ?", @status])
30 c = ARCondition.new(@status == 0 ? "status <> 0" : ["status = ?", @status])
33
34 unless params[:name].blank?
31 unless params[:name].blank?
35 name = "%#{params[:name].strip.downcase}%"
32 name = "%#{params[:name].strip.downcase}%"
36 c << ["LOWER(identifier) LIKE ? OR LOWER(name) LIKE ?", name, name]
33 c << ["LOWER(identifier) LIKE ? OR LOWER(name) LIKE ?", name, name]
37 end
34 end
38
39 @projects = Project.find :all, :order => 'lft',
35 @projects = Project.find :all, :order => 'lft',
40 :conditions => c.conditions
36 :conditions => c.conditions
41
37
42 render :action => "projects", :layout => false if request.xhr?
38 render :action => "projects", :layout => false if request.xhr?
43 end
39 end
44
40
45 def plugins
41 def plugins
46 @plugins = Redmine::Plugin.all
42 @plugins = Redmine::Plugin.all
47 end
43 end
48
44
49 # Loads the default configuration
45 # Loads the default configuration
50 # (roles, trackers, statuses, workflow, enumerations)
46 # (roles, trackers, statuses, workflow, enumerations)
51 def default_configuration
47 def default_configuration
@@ -59,7 +55,7 class AdminController < ApplicationController
59 end
55 end
60 redirect_to :action => 'index'
56 redirect_to :action => 'index'
61 end
57 end
62
58
63 def test_email
59 def test_email
64 raise_delivery_errors = ActionMailer::Base.raise_delivery_errors
60 raise_delivery_errors = ActionMailer::Base.raise_delivery_errors
65 # Force ActionMailer to raise delivery errors so we can catch it
61 # Force ActionMailer to raise delivery errors so we can catch it
@@ -73,14 +69,16 class AdminController < ApplicationController
73 ActionMailer::Base.raise_delivery_errors = raise_delivery_errors
69 ActionMailer::Base.raise_delivery_errors = raise_delivery_errors
74 redirect_to :controller => 'settings', :action => 'edit', :tab => 'notifications'
70 redirect_to :controller => 'settings', :action => 'edit', :tab => 'notifications'
75 end
71 end
76
72
77 def info
73 def info
78 @db_adapter_name = ActiveRecord::Base.connection.adapter_name
74 @db_adapter_name = ActiveRecord::Base.connection.adapter_name
79 @checklist = [
75 @checklist = [
80 [:text_default_administrator_account_changed, User.find(:first, :conditions => ["login=? and hashed_password=?", 'admin', User.hash_password('admin')]).nil?],
76 [:text_default_administrator_account_changed,
77 User.find(:first,
78 :conditions => ["login=? and hashed_password=?", 'admin', User.hash_password('admin')]).nil?],
81 [:text_file_repository_writable, File.writable?(Attachment.storage_path)],
79 [:text_file_repository_writable, File.writable?(Attachment.storage_path)],
82 [:text_plugin_assets_writable, File.writable?(Engines.public_directory)],
80 [:text_plugin_assets_writable, File.writable?(Engines.public_directory)],
83 [:text_rmagick_available, Object.const_defined?(:Magick)]
81 [:text_rmagick_available, Object.const_defined?(:Magick)]
84 ]
82 ]
85 end
83 end
86 end
84 end
General Comments 0
You need to be logged in to leave comments. Login now