kenmirrors/firefly-iii
1
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2025-10-27 05:51:56 +00:00
Code Issues Projects Releases Wiki Activity

More for #339

Browse Source
This commit is contained in:
James Cole
2016-10-22 22:03:00 +02:00
parent 49e32abd3f
commit a8a8afc2be
6 changed files with 32 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
app/Http/Controllers/AttachmentController.php
View File

@@ -164,14 +164,8 @@ class AttachmentController extends Controller
*/ */
public function update(AttachmentFormRequest $request, AttachmentRepositoryInterface $repository, Attachment $attachment) public function update(AttachmentFormRequest $request, AttachmentRepositoryInterface $repository, Attachment $attachment)
{ {
$data = $request->getAttachmentData();
$attachmentData = [ $repository->update($attachment, $data);
'title' => $request->input('title'),
'description' => $request->input('description'),
'notes' => $request->input('notes'),
];
$repository->update($attachment, $attachmentData);
Session::flash('success', strval(trans('firefly.attachment_updated', ['name' => $attachment->filename]))); Session::flash('success', strval(trans('firefly.attachment_updated', ['name' => $attachment->filename])));
Preferences::mark(); Preferences::mark();

15
app/Http/Controllers/BudgetController.php
View File

@@ -359,11 +359,8 @@ class BudgetController extends Controller
*/ */
public function store(BudgetFormRequest $request, BudgetRepositoryInterface $repository) public function store(BudgetFormRequest $request, BudgetRepositoryInterface $repository)
{ {
$budgetData = [ $data = $request->getBudgetData();
'name' => $request->input('name'), $budget = $repository->store($data);
'user' => auth()->user()->id,
];
$budget = $repository->store($budgetData);
Session::flash('success', strval(trans('firefly.stored_new_budget', ['name' => e($budget->name)]))); Session::flash('success', strval(trans('firefly.stored_new_budget', ['name' => e($budget->name)])));
Preferences::mark(); Preferences::mark();
@@ -389,12 +386,8 @@ class BudgetController extends Controller
*/ */
public function update(BudgetFormRequest $request, BudgetRepositoryInterface $repository, Budget $budget) public function update(BudgetFormRequest $request, BudgetRepositoryInterface $repository, Budget $budget)
{ {
$budgetData = [ $data = $request->getBudgetData();
'name' => $request->input('name'), $repository->update($budget, $data);
'active' => intval($request->input('active')) == 1,
];
$repository->update($budget, $budgetData);
Session::flash('success', strval(trans('firefly.updated_budget', ['name' => e($budget->name)]))); Session::flash('success', strval(trans('firefly.updated_budget', ['name' => e($budget->name)])));
Preferences::mark(); Preferences::mark();

2
app/Http/Requests/AccountFormRequest.php
View File

@@ -37,7 +37,7 @@ class AccountFormRequest extends Request
/** /**
* @return array * @return array
*/ */
public function getAccountDate(): array public function getAccountData(): array
{ {
return [ return [
'name' => trim($this->input('name')), 'name' => trim($this->input('name')),

12
app/Http/Requests/AttachmentFormRequest.php
View File

@@ -30,6 +30,18 @@ class AttachmentFormRequest extends Request
return auth()->check(); return auth()->check();
} }
/**
* @return array
*/
public function getAttachmentData(): array
{
return [
'title' => trim($this->input('title')),
'description' => trim($this->input('description')),
'notes' => trim($this->input('notes')),
];
}
/** /**
* @return array * @return array
*/ */

13
app/Http/Requests/BudgetFormRequest.php
View File

@@ -29,10 +29,21 @@ class BudgetFormRequest extends Request
*/ */
public function authorize() public function authorize()
{ {
// Only allow logged in users
return auth()->check(); return auth()->check();
} }
/**
* @return array
*/
public function getBudgetData(): array
{
return [
'name' => trim($this->input('name')),
'user' => auth()->user()->id,
'active' => intval($this->input('active')) == 1,
];
}
/** /**
* @return array * @return array
*/ */

1
resources/views/budgets/create.twig
View File

@@ -8,6 +8,7 @@
<form method="POST" action="{{ route('budgets.store') }}" accept-charset="UTF-8" class="form-horizontal" id="store"> <form method="POST" action="{{ route('budgets.store') }}" accept-charset="UTF-8" class="form-horizontal" id="store">
<input name="_token" type="hidden" value="{{ csrf_token() }}"> <input name="_token" type="hidden" value="{{ csrf_token() }}">
<input name="active" type="hidden" value="1">
<div class="row"> <div class="row">
<div class="col-lg-6 col-md-6 col-sm-12"> <div class="col-lg-6 col-md-6 col-sm-12">