Better error messages on password reset

app/helpers/reader_helper.rb

@@ -200,5 +200,26 @@ def css_for_readers_groups readers
     }.join("\n")
   end
 
+  def error_messages_except(record, excluded_fields)
+    errors = errors_except(record, excluded_fields)
+    unless errors.empty?
+      error_nodes = errors.map do |key, value|
+        content_tag(:li, content_tag(:strong, key.humanize.titleize) + ": #{value}")
+      end
+      content_tag(:ul, error_nodes.join("\n"), :class => 'error_list')
+    end
+  end
+
+  private
+
+  def errors_except(record, excluded_fields)
+    results = {}
+    record.errors.each do |key, value|
+      unless excluded_fields.include?(key.to_sym)
+        results[key] = value
+      end
+    end
+    results
+  end
 end
 

app/views/password_resets/edit.html.haml

@@ -7,6 +7,7 @@
           %strong 
             = t('reader_extension.sorry').titlecase
             = t('reader_extension.form_problem') + '.'
+        = error_messages_except @reader, [:password, :password_confirmation]
 
       = hidden_field_tag :id, params[:id]
       = hidden_field_tag :confirmation_code, @reader.perishable_token