kenmirrors/firefly-iii
1
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2025-09-30 02:26:58 +00:00
Code Issues Projects Releases Wiki Activity

Auto commit for release 'develop' on 2024-04-18

Browse Source
This commit is contained in:
github-actions
2024-04-18 10:25:45 +02:00
parent 7788bb4b33
commit 6d970a9794
3 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
app/Api/V1/Controllers/User/PreferencesController.php
View File

@@ -84,7 +84,7 @@ class PreferencesController extends Controller
{ {
$manager = $this->getManager(); $manager = $this->getManager();
if('currencyPreference' === $preference->name) { if ('currencyPreference' === $preference->name) {
throw new FireflyException('Please use api/v1/currencies/default instead.'); throw new FireflyException('Please use api/v1/currencies/default instead.');
} }
@@ -108,7 +108,7 @@ class PreferencesController extends Controller
$manager = $this->getManager(); $manager = $this->getManager();
$data = $request->getAll(); $data = $request->getAll();
if('currencyPreference' === $data['name']) { if ('currencyPreference' === $data['name']) {
throw new FireflyException('Please use api/v1/currencies/default instead.'); throw new FireflyException('Please use api/v1/currencies/default instead.');
} }
@@ -131,7 +131,7 @@ class PreferencesController extends Controller
*/ */
public function update(PreferenceUpdateRequest $request, Preference $preference): JsonResponse public function update(PreferenceUpdateRequest $request, Preference $preference): JsonResponse
{ {
if('currencyPreference' === $preference->name) { if ('currencyPreference' === $preference->name) {
throw new FireflyException('Please use api/v1/currencies/default instead.'); throw new FireflyException('Please use api/v1/currencies/default instead.');
} }

2
app/Support/Preferences.php
View File

@@ -44,7 +44,7 @@ class Preferences
} }
return Preference::where('user_id', $user->id) return Preference::where('user_id', $user->id)
->where('name','!=','currencyPreference') ->where('name', '!=', 'currencyPreference')
->where(function (Builder $q) use ($user): void { ->where(function (Builder $q) use ($user): void {
$q->whereNull('user_group_id'); $q->whereNull('user_group_id');
$q->orWhere('user_group_id', $user->user_group_id); $q->orWhere('user_group_id', $user->user_group_id);

6
package-lock.json generated
View File

@@ -4020,9 +4020,9 @@
} }
}, },
"node_modules/caniuse-lite": { "node_modules/caniuse-lite": {
"version": "1.0.30001610", "version": "1.0.30001611",
"resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001610.tgz", "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001611.tgz",
"integrity": "sha512-QFutAY4NgaelojVMjY63o6XlZyORPaLfyMnsl3HgnWdJUcX6K0oaJymHjH8PT5Gk7sTm8rvC/c5COUQKXqmOMA==", "integrity": "sha512-19NuN1/3PjA3QI8Eki55N8my4LzfkMCRLgCVfrl/slbSAchQfV0+GwjPrK3rq37As4UCLlM/DHajbKkAqbv92Q==",
"dev": true, "dev": true,
"funding": [ "funding": [
{ {