diff --git a/README.md b/README.md index 033f8f3f0c..2d54514d55 100644 --- a/README.md +++ b/README.md @@ -73,7 +73,4 @@ Some stuff has been removed: ## Current state I have the basics up and running. Test coverage is currently coming, slowly. -Although I have not checked extensively, some forms and views have CSRF vulnerabilities. This is because not all -views escape all characters by default. Will be fixed. - Questions, ideas or other things to contribute? [Let me know](https://github.com/JC5/firefly-iii/issues/new)! diff --git a/app/Http/Controllers/BudgetController.php b/app/Http/Controllers/BudgetController.php index 1cd2d46706..5d947c27e3 100644 --- a/app/Http/Controllers/BudgetController.php +++ b/app/Http/Controllers/BudgetController.php @@ -98,7 +98,8 @@ class BudgetController extends Controller */ public function index(BudgetRepositoryInterface $repository) { - $budgets = Auth::user()->budgets()->get(); + $budgets = Auth::user()->budgets()->where('active',1)->get(); + $inactive = Auth::user()->budgets()->where('active',0)->get(); // loop the budgets: $budgets->each( @@ -117,7 +118,7 @@ class BudgetController extends Controller $budgetMax = Preferences::get('budgetMaximum', 1000); $budgetMaximum = $budgetMax->data; - return view('budgets.index', compact('budgetMaximum', 'budgets', 'spent', 'spentPCT', 'overspent', 'amount')); + return view('budgets.index', compact('budgetMaximum','inactive', 'budgets', 'spent', 'spentPCT', 'overspent', 'amount')); } /** diff --git a/resources/views/budgets/index.blade.php b/resources/views/budgets/index.blade.php index 6d1642f930..2d7877f4f8 100644 --- a/resources/views/budgets/index.blade.php +++ b/resources/views/budgets/index.blade.php @@ -64,6 +64,7 @@ +