From fa4c7f79e3c55872cd730241c4358e03d56192eb Mon Sep 17 00:00:00 2001 From: Tracey Eubanks Date: Fri, 15 Jul 2011 15:31:24 -0600 Subject: [PATCH] view by environment in the errs page as well --- app/controllers/errs_controller.rb | 6 ++++-- app/views/errs/_table.html.haml | 5 ++++- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/app/controllers/errs_controller.rb b/app/controllers/errs_controller.rb index 3b18616..c1ec811 100644 --- a/app/controllers/errs_controller.rb +++ b/app/controllers/errs_controller.rb @@ -5,12 +5,14 @@ class ErrsController < ApplicationController def index app_scope = current_user.admin? ? App.all : current_user.apps + where_clause = {} + where_clause[:environment] = params[:environment] if(params[:environment].present?) respond_to do |format| format.html do - @errs = Err.for_apps(app_scope).unresolved.ordered.paginate(:page => params[:page], :per_page => current_user.per_page) + @errs = Err.for_apps(app_scope).where(where_clause).unresolved.ordered.paginate(:page => params[:page], :per_page => current_user.per_page) end format.atom do - @errs = Err.for_apps(app_scope).unresolved.ordered + @errs = Err.for_apps(app_scope).where(where_clause).unresolved.ordered end end end diff --git a/app/views/errs/_table.html.haml b/app/views/errs/_table.html.haml index 4ffd22c..024aad1 100644 --- a/app/views/errs/_table.html.haml +++ b/app/views/errs/_table.html.haml @@ -12,7 +12,10 @@ %tr{:class => err.resolved? ? 'resolved' : 'unresolved'} %td.app = link_to err.app.name, app_path(err.app) - %span.environment= link_to err.environment, app_path(environment: err.environment) + - if(current_page?(:controller => 'errs')) + %span.environment= link_to err.environment, errs_path(environment: err.environment) + - else + %span.environment= link_to err.environment, app_path(environment: err.environment) %td.message = link_to err.message, app_err_path(err.app, err) %em= err.where -- libgit2 0.21.2