diff --git a/Gemfile b/Gemfile index 34e81cef6..03b349c18 100644 --- a/Gemfile +++ b/Gemfile @@ -27,8 +27,10 @@ group :development do gem 'grape-swagger' #gem 'grape-swagger-ui', git: 'https://github.com/guange2015/grape-swagger-ui.git' #gem 'puma' - gem 'pry-rails' - gem 'pry-byebug' + #gem 'pry-rails' + #gem 'pry-byebug' + #gem 'pry-stack_explorer' + #gem 'pry-debugger' gem 'better_errors', path: 'lib/better_errors' gem 'rack-mini-profiler', path: 'lib/rack-mini-profiler' end diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb index 9629ed437..b4f54f075 100644 --- a/app/helpers/application_helper.rb +++ b/app/helpers/application_helper.rb @@ -1994,4 +1994,10 @@ module ApplicationHelper end technical_title end + + + def ie8? + request.env["HTTP_USER_AGENT"] =~ /MSIE 8.0/ + end + end diff --git a/app/views/files/_attachement_list.html.erb b/app/views/files/_attachement_list.html.erb index 001519a28..41025e619 100644 --- a/app/views/files/_attachement_list.html.erb +++ b/app/views/files/_attachement_list.html.erb @@ -22,13 +22,13 @@ - + <%= file_field_tag 'attachments[dummy][file]', :id => '_file', :class => 'file_selector', :multiple => true, :onchange => 'addInputFiles(this);', - :style => 'display:none', + :style => ie8? ? '': 'display:none', :data => { :max_file_size => Setting.attachment_max_size.to_i.kilobytes, :max_file_size_message => l(:error_attachment_too_big, :max_size => number_to_human_size(Setting.attachment_max_size.to_i.kilobytes)), diff --git a/app/views/files/_upload_show.html.erb b/app/views/files/_upload_show.html.erb index 91d050d93..70465c21e 100644 --- a/app/views/files/_upload_show.html.erb +++ b/app/views/files/_upload_show.html.erb @@ -4,7 +4,8 @@