app/helpers/user_helper.rb in kit_cms-2.3.20 vs app/helpers/user_helper.rb in kit_cms-2.3.22

- old
+ new

@@ -1,34 +1,6 @@ module UserHelper - def devise_error_messages! - flash_alerts = [] - error_key = 'errors.messages.not_saved' - - if !flash.empty? - flash_alerts.push(flash[:error]) if flash[:error] - flash_alerts.push(flash[:alert]) if flash[:alert] - flash_alerts.push(flash[:notice]) if flash[:notice] - error_key = 'devise.failure.invalid' - end - - return "" if resource.errors.empty? && flash_alerts.empty? - errors = resource.errors.empty? ? flash_alerts : resource.errors.full_messages - - messages = errors.map { |msg| content_tag(:li, msg) }.join - sentence = I18n.t(error_key, :count => errors.count, - :resource => resource.class.model_name.human.downcase) - - html = <<-HTML - <div id="error_explanation"> - <h2>#{sentence}</h2> - <ul>#{messages}</ul> - </div> - HTML - - html.html_safe - end - def field_types FormFieldType.sys(_sid).where(:hidden=>0).order(:name).all end end