Commit fa4c7f79e3c55872cd730241c4358e03d56192eb
1 parent
3b14e3c2
Exists in
master
and in
1 other branch
view by environment in the errs page as well
Showing
2 changed files
with
8 additions
and
3 deletions
Show diff stats
app/controllers/errs_controller.rb
| ... | ... | @@ -5,12 +5,14 @@ class ErrsController < ApplicationController |
| 5 | 5 | |
| 6 | 6 | def index |
| 7 | 7 | app_scope = current_user.admin? ? App.all : current_user.apps |
| 8 | + where_clause = {} | |
| 9 | + where_clause[:environment] = params[:environment] if(params[:environment].present?) | |
| 8 | 10 | respond_to do |format| |
| 9 | 11 | format.html do |
| 10 | - @errs = Err.for_apps(app_scope).unresolved.ordered.paginate(:page => params[:page], :per_page => current_user.per_page) | |
| 12 | + @errs = Err.for_apps(app_scope).where(where_clause).unresolved.ordered.paginate(:page => params[:page], :per_page => current_user.per_page) | |
| 11 | 13 | end |
| 12 | 14 | format.atom do |
| 13 | - @errs = Err.for_apps(app_scope).unresolved.ordered | |
| 15 | + @errs = Err.for_apps(app_scope).where(where_clause).unresolved.ordered | |
| 14 | 16 | end |
| 15 | 17 | end |
| 16 | 18 | end | ... | ... |
app/views/errs/_table.html.haml
| ... | ... | @@ -12,7 +12,10 @@ |
| 12 | 12 | %tr{:class => err.resolved? ? 'resolved' : 'unresolved'} |
| 13 | 13 | %td.app |
| 14 | 14 | = link_to err.app.name, app_path(err.app) |
| 15 | - %span.environment= link_to err.environment, app_path(environment: err.environment) | |
| 15 | + - if(current_page?(:controller => 'errs')) | |
| 16 | + %span.environment= link_to err.environment, errs_path(environment: err.environment) | |
| 17 | + - else | |
| 18 | + %span.environment= link_to err.environment, app_path(environment: err.environment) | |
| 16 | 19 | %td.message |
| 17 | 20 | = link_to err.message, app_err_path(err.app, err) |
| 18 | 21 | %em= err.where | ... | ... |