app/helpers/bootstrap_flash_helper.rb in twitter-bootstrap-rails-2.2.3 vs app/helpers/bootstrap_flash_helper.rb in twitter-bootstrap-rails-2.2.4
- old
+ new
@@ -1,16 +1,23 @@
module BootstrapFlashHelper
+ ALERT_TYPES = [:error, :info, :success, :warning]
+
def bootstrap_flash
flash_messages = []
flash.each do |type, message|
# Skip empty messages, e.g. for devise messages set to nothing in a locale file.
next if message.blank?
+
type = :success if type == :notice
type = :error if type == :alert
- text = content_tag(:div,
- content_tag(:button, raw("×"), :class => "close", "data-dismiss" => "alert") +
- message, :class => "alert fade in alert-#{type}")
- flash_messages << text if message
+ next unless ALERT_TYPES.include?(type)
+
+ Array(message).each do |msg|
+ text = content_tag(:div,
+ content_tag(:button, raw("×"), :class => "close", "data-dismiss" => "alert") +
+ msg, :class => "alert fade in alert-#{type}")
+ flash_messages << text if message
+ end
end
flash_messages.join("\n").html_safe
end
end