diff --git a/app/controllers/user_admin_controller.rb b/app/controllers/user_admin_controller.rb --- a/app/controllers/user_admin_controller.rb +++ b/app/controllers/user_admin_controller.rb @@ -153,7 +153,7 @@ @prefix = params[:prefix] || '' @non_admin_users = User.find_non_admin_with_prefix(@prefix) @changed = false - if request.request_method == :post + if request.request_method == 'POST' @non_admin_users.each do |user| password = random_password user.password = password diff --git a/app/views/user_admin/random_all_passwords.html.haml b/app/views/user_admin/random_all_passwords.html.haml --- a/app/views/user_admin/random_all_passwords.html.haml +++ b/app/views/user_admin/random_all_passwords.html.haml @@ -1,6 +1,6 @@ %h1 Random user passwords --if @changed +- if @changed %p %b Done! Here's a new password list. @@ -12,28 +12,28 @@ %th Login %th Fullname %th Password - -for u in @non_admin_users + - for u in @non_admin_users %tr %td= u.login %td= u.full_name %td %tt= u.password --else - -if @prefix!='' +- else + - if @prefix!='' Current prefix: = @prefix - -form_tag((url_for :action => 'random_all_passwords'), :method => 'get') do + = form_tag((url_for :action => 'random_all_passwords'), :method => 'get') do Change prefix - =text_field_tag 'prefix' - =submit_tag 'Change' + = text_field_tag 'prefix' + = submit_tag 'Change' This will change passwords of the following users. %ul - -for u in @non_admin_users + - for u in @non_admin_users %li= u.login - -form_tag((url_for :action => 'random_all_passwords'), :method => 'post') do - =hidden_field_tag 'prefix', @prefix + = form_tag((url_for :action => 'random_all_passwords'), :method => 'post') do + = hidden_field_tag 'prefix', @prefix Are you sure? - =submit_tag 'Go ahead' + = submit_tag 'Go ahead'