mirror of
https://github.com/firefly-iii/firefly-iii.git
synced 2025-09-18 18:44:16 +00:00
Drop a specific preference from the return of Firefly III
This commit is contained in:
@@ -84,6 +84,10 @@ class PreferencesController extends Controller
|
|||||||
{
|
{
|
||||||
$manager = $this->getManager();
|
$manager = $this->getManager();
|
||||||
|
|
||||||
|
if('currencyPreference' === $preference->name) {
|
||||||
|
throw new FireflyException('Please use api/v1/currencies/default instead.');
|
||||||
|
}
|
||||||
|
|
||||||
/** @var PreferenceTransformer $transformer */
|
/** @var PreferenceTransformer $transformer */
|
||||||
$transformer = app(PreferenceTransformer::class);
|
$transformer = app(PreferenceTransformer::class);
|
||||||
$transformer->setParameters($this->parameters);
|
$transformer->setParameters($this->parameters);
|
||||||
@@ -103,6 +107,11 @@ class PreferencesController extends Controller
|
|||||||
{
|
{
|
||||||
$manager = $this->getManager();
|
$manager = $this->getManager();
|
||||||
$data = $request->getAll();
|
$data = $request->getAll();
|
||||||
|
|
||||||
|
if('currencyPreference' === $data['name']) {
|
||||||
|
throw new FireflyException('Please use api/v1/currencies/default instead.');
|
||||||
|
}
|
||||||
|
|
||||||
$pref = app('preferences')->set($data['name'], $data['data']);
|
$pref = app('preferences')->set($data['name'], $data['data']);
|
||||||
|
|
||||||
/** @var PreferenceTransformer $transformer */
|
/** @var PreferenceTransformer $transformer */
|
||||||
@@ -122,6 +131,10 @@ class PreferencesController extends Controller
|
|||||||
*/
|
*/
|
||||||
public function update(PreferenceUpdateRequest $request, Preference $preference): JsonResponse
|
public function update(PreferenceUpdateRequest $request, Preference $preference): JsonResponse
|
||||||
{
|
{
|
||||||
|
if('currencyPreference' === $preference->name) {
|
||||||
|
throw new FireflyException('Please use api/v1/currencies/default instead.');
|
||||||
|
}
|
||||||
|
|
||||||
$manager = $this->getManager();
|
$manager = $this->getManager();
|
||||||
$data = $request->getAll();
|
$data = $request->getAll();
|
||||||
$pref = app('preferences')->set($preference->name, $data['data']);
|
$pref = app('preferences')->set($preference->name, $data['data']);
|
||||||
|
@@ -44,6 +44,7 @@ class Preferences
|
|||||||
}
|
}
|
||||||
|
|
||||||
return Preference::where('user_id', $user->id)
|
return Preference::where('user_id', $user->id)
|
||||||
|
->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);
|
||||||
|
Reference in New Issue
Block a user