diff options
Diffstat (limited to 'app/controllers')
| -rw-r--r-- | app/controllers/admin_user_controller.rb | 23 | ||||
| -rw-r--r-- | app/controllers/request_controller.rb | 6 |
2 files changed, 25 insertions, 4 deletions
diff --git a/app/controllers/admin_user_controller.rb b/app/controllers/admin_user_controller.rb index 50be7e65d..f9fe839df 100644 --- a/app/controllers/admin_user_controller.rb +++ b/app/controllers/admin_user_controller.rb @@ -4,7 +4,7 @@ # Copyright (c) 2008 UK Citizens Online Democracy. All rights reserved. # Email: francis@mysociety.org; WWW: http://www.mysociety.org/ # -# $Id: admin_user_controller.rb,v 1.5 2008-07-28 18:04:38 francis Exp $ +# $Id: admin_user_controller.rb,v 1.6 2008-08-27 00:39:03 francis Exp $ class AdminUserController < ApplicationController layout "admin" @@ -27,6 +27,27 @@ class AdminUserController < ApplicationController @admin_user = User.find(params[:id]) end + def edit + @admin_user = User.find(params[:id]) + end + + def update + @admin_user = User.find(params[:id]) + + @admin_user.name = params[:admin_user][:name] + @admin_user.email = params[:admin_user][:email] + @admin_user.admin_level = params[:admin_user][:admin_level] + + if @admin_user.valid? + @admin_user.save! + flash[:notice] = 'User successfully updated.' + redirect_to user_admin_url(@admin_user) + else + render :action => 'edit' + end + end + + private end diff --git a/app/controllers/request_controller.rb b/app/controllers/request_controller.rb index 4cb3e497d..41c48dee3 100644 --- a/app/controllers/request_controller.rb +++ b/app/controllers/request_controller.rb @@ -4,7 +4,7 @@ # Copyright (c) 2007 UK Citizens Online Democracy. All rights reserved. # Email: francis@mysociety.org; WWW: http://www.mysociety.org/ # -# $Id: request_controller.rb,v 1.95 2008-08-07 00:24:51 francis Exp $ +# $Id: request_controller.rb,v 1.96 2008-08-27 00:39:03 francis Exp $ class RequestController < ApplicationController @@ -23,7 +23,7 @@ class RequestController < ApplicationController @info_request_events = @info_request.info_request_events @status = @info_request.calculate_status @collapse_quotes = params[:unfold] ? false : true - @is_owning_user = !authenticated_user.nil? && authenticated_user.id == @info_request.user_id + @is_owning_user = !authenticated_user.nil? && (authenticated_user.id == @info_request.user_id || authenticated_user.owns_every_request?) @events_needing_description = @info_request.events_needing_description last_event = @events_needing_description[-1] @last_info_request_event_id = last_event.nil? ? nil : last_event.id @@ -273,7 +273,7 @@ class RequestController < ApplicationController end @info_request = InfoRequest.find(params[:id].to_i) @collapse_quotes = params[:unfold] ? false : true - @is_owning_user = !authenticated_user.nil? && authenticated_user.id == @info_request.user_id + @is_owning_user = !authenticated_user.nil? && (authenticated_user.id == @info_request.user_id || authenticated_user.owns_every_request?) params_outgoing_message = params[:outgoing_message] if params_outgoing_message.nil? |