Skip to content

Firefly III: a personal finances manager

Restore currency functionality.

James Cole6466bc927268
diff --git a/app/Api/V1/Controllers/Models/TransactionCurrency/UpdateController.php b/app/Api/V1/Controllers/Models/TransactionCurrency/UpdateController.php
index bc6e4f6ba2..57d61fa35a 100644
--- a/app/Api/V1/Controllers/Models/TransactionCurrency/UpdateController.php
+++ b/app/Api/V1/Controllers/Models/TransactionCurrency/UpdateController.php
@@ -154,8 +154,6 @@ final class UpdateController extends Controller
public function update(UpdateRequest $request, TransactionCurrency $currency): JsonResponse
{
$data = $request->getAll();
- Log::debug(__METHOD__, $data);
-
/** @var User $user */
$user = auth()->user();
diff --git a/app/Api/V1/Requests/Models/TransactionCurrency/UpdateRequest.php b/app/Api/V1/Requests/Models/TransactionCurrency/UpdateRequest.php
index c6ccd62d7b..7970d784cc 100644
--- a/app/Api/V1/Requests/Models/TransactionCurrency/UpdateRequest.php
+++ b/app/Api/V1/Requests/Models/TransactionCurrency/UpdateRequest.php
@@ -28,6 +28,7 @@ use FireflyIII\Models\TransactionCurrency;
use FireflyIII\Rules\IsBoolean;
use FireflyIII\Support\Request\ChecksLogin;
use FireflyIII\Support\Request\ConvertsDataTypes;
+use FireflyIII\User;
use Illuminate\Foundation\Http\FormRequest;
/**
@@ -45,15 +46,23 @@ class UpdateRequest extends FormRequest
*/
public function getAll(): array
{
- // return nothing that isn't explicitly in the array:
+ /** @var User $user */
+ $user = auth()->user();
+ $isAdmin = $user->hasRole('owner');
+
$fields = [
- 'name' => ['name', 'convertString'],
- 'code' => ['code', 'convertString'],
- 'symbol' => ['symbol', 'convertString'],
- 'decimal_places' => ['decimal_places', 'convertInteger'],
- 'default' => ['default', 'boolean'],
- 'enabled' => ['enabled', 'boolean'],
+ 'enabled' => ['enabled', 'boolean'],
];
+ if ($isAdmin) {
+ $fields = [
+ 'name' => ['name', 'convertString'],
+ 'code' => ['code', 'convertString'],
+ 'symbol' => ['symbol', 'convertString'],
+ 'decimal_places' => ['decimal_places', 'convertInteger'],
+ 'default' => ['default', 'boolean'],
+ 'enabled' => ['enabled', 'boolean'],
+ ];
+ }
return $this->getAllData($fields);
}
diff --git a/routes/api.php b/routes/api.php
index 408fdbea9f..b4f496f8c5 100644
--- a/routes/api.php
+++ b/routes/api.php
@@ -635,6 +635,7 @@ Route::group(
],
static function (): void {
Route::get('', ['uses' => 'ShowController@index', 'as' => 'index']);
+ Route::put('{currency_code?}', ['uses' => 'UpdateController@update', 'as' => 'update']);
Route::get('primary', ['uses' => 'ShowController@showPrimary', 'as' => 'show.primary']);
Route::get('default', ['uses' => 'ShowController@showPrimary', 'as' => 'show.default']);
Route::get('{currency_code}', ['uses' => 'ShowController@show', 'as' => 'show']);
@@ -665,7 +666,6 @@ Route::group(
static function (): void {
Route::delete('{currency_code}', ['uses' => 'DestroyController@destroy', 'as' => 'delete']);
Route::post('', ['uses' => 'StoreController@store', 'as' => 'store']);
- Route::put('{currency_code?}', ['uses' => 'UpdateController@update', 'as' => 'update']);
}
);