Commit b445b4822c8791f4ef23c36508622cfcec0745f8
1 parent
0eb004de
Exists in
master
and in
1 other branch
filter by environment
Showing
2 changed files
with
5 additions
and
3 deletions
Show diff stats
app/controllers/apps_controller.rb
| @@ -8,13 +8,15 @@ class AppsController < ApplicationController | @@ -8,13 +8,15 @@ class AppsController < ApplicationController | ||
| 8 | end | 8 | end |
| 9 | 9 | ||
| 10 | def show | 10 | def show |
| 11 | + where_clause = {} | ||
| 11 | respond_to do |format| | 12 | respond_to do |format| |
| 12 | format.html do | 13 | format.html do |
| 14 | + where_clause[:environment] = params[:environment] if(params[:environment].present?) | ||
| 13 | if(params[:all_errs]) | 15 | if(params[:all_errs]) |
| 14 | - @errs = @app.errs.ordered.paginate(:page => params[:page], :per_page => current_user.per_page) | 16 | + @errs = @app.errs.where(where_clause).ordered.paginate(:page => params[:page], :per_page => current_user.per_page) |
| 15 | @all_errs = true | 17 | @all_errs = true |
| 16 | else | 18 | else |
| 17 | - @errs = @app.errs.unresolved.ordered.paginate(:page => params[:page], :per_page => current_user.per_page) | 19 | + @errs = @app.errs.unresolved.where(where_clause).ordered.paginate(:page => params[:page], :per_page => current_user.per_page) |
| 18 | @all_errs = false | 20 | @all_errs = false |
| 19 | end | 21 | end |
| 20 | @deploys = @app.deploys.order_by(:created_at.desc).limit(5) | 22 | @deploys = @app.deploys.order_by(:created_at.desc).limit(5) |
app/views/errs/_table.html.haml
| @@ -12,7 +12,7 @@ | @@ -12,7 +12,7 @@ | ||
| 12 | %tr{:class => err.resolved? ? 'resolved' : 'unresolved'} | 12 | %tr{:class => err.resolved? ? 'resolved' : 'unresolved'} |
| 13 | %td.app | 13 | %td.app |
| 14 | = link_to err.app.name, app_path(err.app) | 14 | = link_to err.app.name, app_path(err.app) |
| 15 | - %span.environment= err.environment | 15 | + %span.environment= link_to err.environment, app_path(environment: err.environment) |
| 16 | %td.message | 16 | %td.message |
| 17 | = link_to err.message, app_err_path(err.app, err) | 17 | = link_to err.message, app_err_path(err.app, err) |
| 18 | %em= err.where | 18 | %em= err.where |