aboutsummaryrefslogtreecommitdiffstats
path: root/app/helpers/application_helper.rb
diff options
context:
space:
mode:
Diffstat (limited to 'app/helpers/application_helper.rb')
-rw-r--r--app/helpers/application_helper.rb8
1 files changed, 2 insertions, 6 deletions
diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb
index 090359f1f..ab953cb25 100644
--- a/app/helpers/application_helper.rb
+++ b/app/helpers/application_helper.rb
@@ -43,7 +43,7 @@ module ApplicationHelper
end
content_tag(:div,
- content_tag(:ul, error_messages),
+ content_tag(:ul, error_messages.join),
html
)
else
@@ -108,7 +108,7 @@ module ApplicationHelper
end
def form_tag_id(object_name, method_name, locale=nil)
- if locale.nil?
+ if locale.nil?
return "#{sanitized_object_name(object_name.to_s)}_#{sanitized_method_name(method_name.to_s)}"
else
return "#{sanitized_object_name(object_name.to_s)}_#{sanitized_method_name(method_name.to_s)}__#{locale.to_s}"
@@ -131,9 +131,5 @@ module ApplicationHelper
return "#{exact_date} (#{ago_text})"
end
- def is_admin?
- return !session[:using_admin].nil? || (!@user.nil? && @user.admin_level == "super")
- end
-
end