@@ -18,19 +18,24 @@ class Administration::AdminsController < ApplicationController flash[:notice] = "#{person.name} is a Super Administrator." else person.admin = Admin.create! - add_errors_to_flash(person) unless person.save + if person.save + flash[:notice] = 'Admin created.' + else + add_errors_to_flash(person) + end end else flash[:notice] = 'No more admins are allowed.' end end - redirect_to admin_path + redirect_to administration_admins_path end def destroy @admin = Admin.find(params[:id]) @admin.destroy - redirect_to admin_path + flash[:notice] = 'Admin removed.' + redirect_to administration_admins_path end private app/controllers/administration/admins_controller.rb @@ -1,5 +1,7 @@ class Administration::SettingsController < ApplicationController + before_filter :only_admins + def index @settings = Setting.find_all_by_site_id_and_hidden( Site.current.id, @@ -22,9 +24,28 @@ class Administration::SettingsController < ApplicationController value = value == 'true' if setting.format == 'boolean' setting.update_attributes! :value => value end - Setting.precache_settings(true) - expire_fragment(%r{views/}) + reload_settings flash[:notice] = 'Settings saved.' redirect_to administration_settings_path end + + def reload + reload_settings + flash[:notice] = 'Settings reloaded.' + redirect_to admin_path + end + + private + + def only_admins + unless @logged_in.super_admin? + render :text => 'You must be a super administrator to modify settings.', :layout => true, :status => 401 + return false + end + end + + def reload_settings + Setting.precache_settings(true) + expire_fragment(%r{views/}) + end end app/controllers/administration/settings_controller.rb @@ -25,6 +25,7 @@ <li><%= link_to 'Community Logo', administration_logo_path %></li> <li><%= link_to 'Custom Theme', edit_administration_theme_path %></li> <li><%= link_to 'Pages', pages_path %></li> + <li><%= link_to 'Reload Settings', reload_administration_settings_path, :method => 'put', :title => 'If you have made modifications to the system from the command line, you may need to reload all settings to see the changes take effect.' %></li> </ul> <% end %> <% end %> app/views/administration/dashboards/index.html.erb @@ -107,7 +107,7 @@ unless defined?(DISABLE_ROUTES) admin.resources :admins admin.resources :membership_requests admin.resources :log_items, :collection => {:batch => :put} - admin.resources :settings, :collection => {:batch => :put} + admin.resources :settings, :collection => {:batch => :put, :reload => :put} admin.resources :files, :requirements => {:id => /[a-z0-9_]+(\.[a-z0-9_]+)?/} admin.resources :attendance admin.resource :theme config/routes.rb f10881b32d92bf5207267b22235e91f27c925b28 Tim Morgan tim@timmorgan.org http://github.com/seven1m/onebody/commit/9f43aad3685353d701c50904c3ebaefa85a16e87 9f43aad3685353d701c50904c3ebaefa85a16e87 2009-10-25T13:56:02-07:00 2009-10-25T13:56:02-07:00 Ability to reload settings from admin dashboard. cb00bb9af7caebdbea3525017fdaf87aae9f9888 Tim Morgan tim@timmorgan.org