diff --git a/app/helpers/errs_helper.rb b/app/helpers/errs_helper.rb index ff56309..a84e12d 100644 --- a/app/helpers/errs_helper.rb +++ b/app/helpers/errs_helper.rb @@ -3,5 +3,8 @@ module ErrsHelper def last_notice_at err err.last_notice_at || err.created_at end - + + def err_confirm + Errbit::Config.confirm_resolve_err === false ? nil : 'Seriously?' + end end \ No newline at end of file diff --git a/app/views/errs/_table.html.haml b/app/views/errs/_table.html.haml index 3bd09f3..28efc14 100644 --- a/app/views/errs/_table.html.haml +++ b/app/views/errs/_table.html.haml @@ -19,7 +19,7 @@ %td.latest #{time_ago_in_words(last_notice_at err)} ago %td.deploy= err.app.last_deploy_at ? err.app.last_deploy_at.to_s(:micro) : 'n/a' %td.count= link_to err.notices.count, app_err_path(err.app, err) - %td.resolve= link_to image_tag("thumbs-up.png"), resolve_app_err_path(err.app, err), :title => "Resolve", :method => :put, :confirm => 'Seriously?', :class => 'resolve' if err.unresolved? + %td.resolve= link_to image_tag("thumbs-up.png"), resolve_app_err_path(err.app, err), :title => "Resolve", :method => :put, :confirm => err_confirm, :class => 'resolve' if err.unresolved? - if errs.none? %tr %td{:colspan => (@app ? 5 : 6)} diff --git a/app/views/errs/show.html.haml b/app/views/errs/show.html.haml index bcf1e6e..62f533c 100644 --- a/app/views/errs/show.html.haml +++ b/app/views/errs/show.html.haml @@ -8,7 +8,7 @@ %strong Last Notice: = last_notice_at(@err).to_s(:micro) - content_for :action_bar do - %span= link_to 'resolve', resolve_app_err_path(@app, @err), :method => :put, :confirm => (Errbit::Config.confirm_resolve_err === false ? nil : 'Seriously?'), :class => 'resolve' if @err.unresolved? + %span= link_to 'resolve', resolve_app_err_path(@app, @err), :method => :put, :confirm => err_confirm, :class => 'resolve' if @err.unresolved? %h4= @notice.try(:message) -- libgit2 0.21.2