Merge branch 'master' into feature/2275#destroy_budgets

2018-01-09 11:03:51 +01:00
parent b1d685c4dc 01c41c7cca
commit 6e96c8c057
19 changed files with 182 additions and 49 deletions
--- a/app/controllers/admin/budgets_controller.rb
+++ b/app/controllers/admin/budgets_controller.rb
@@ -27,7 +27,7 @@ class Admin::BudgetsController < Admin::BaseController

  def update
    if @budget.update(budget_params)
-      redirect_to admin_budget_path(@budget), notice: t('admin.budgets.update.notice')
+      redirect_to admin_budgets_path, notice: t('admin.budgets.update.notice')
    else
      render :edit
    end
--- a/app/controllers/budgets_controller.rb
+++ b/app/controllers/budgets_controller.rb
@@ -1,5 +1,6 @@
 class BudgetsController < ApplicationController
  include FeatureFlags
+  include BudgetsHelper
  feature_flag :budgets

  load_and_authorize_resource
@@ -9,6 +10,7 @@ class BudgetsController < ApplicationController
  respond_to :html, :js

  def show
+    raise ActionController::RoutingError, 'Not Found' unless budget_published?(@budget)
  end

  def index