From 9c66fa0dc8f17ff269d644855d8fda8e8d7d447a Mon Sep 17 00:00:00 2001 From: kikito Date: Wed, 4 Jan 2017 16:31:16 +0100 Subject: [PATCH] removes filter from valuation index page --- app/controllers/valuation/budgets_controller.rb | 4 +--- app/views/valuation/budgets/index.html.erb | 4 +--- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/app/controllers/valuation/budgets_controller.rb b/app/controllers/valuation/budgets_controller.rb index 3b470101f..0b7efe858 100644 --- a/app/controllers/valuation/budgets_controller.rb +++ b/app/controllers/valuation/budgets_controller.rb @@ -2,12 +2,10 @@ class Valuation::BudgetsController < Valuation::BaseController include FeatureFlags feature_flag :budgets - has_filters %w{current finished}, only: :index - load_and_authorize_resource def index - @budgets = Budget.send(@current_filter).order(created_at: :desc).page(params[:page]) + @budgets = @budgets.current.order(created_at: :desc).page(params[:page]) end end diff --git a/app/views/valuation/budgets/index.html.erb b/app/views/valuation/budgets/index.html.erb index 014633373..47571688f 100644 --- a/app/views/valuation/budgets/index.html.erb +++ b/app/views/valuation/budgets/index.html.erb @@ -1,7 +1,5 @@

<%= t("valuation.budgets.index.title") %>

-<%= render 'shared/filter_subnav', i18n_namespace: "valuation.budgets.index" %> -

<%= page_entries_info @budgets %>

@@ -14,4 +12,4 @@ <% end %>
-<%= paginate @budgets %> \ No newline at end of file +<%= paginate @budgets %>