kenmirrors/firefly-iii
1
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2025-09-18 18:44:16 +00:00
Code Issues Projects Releases Wiki Activity

Make sure user_group_id is rendered as int where relevant.

Browse Source
This commit is contained in:
James Cole
2025-02-15 05:38:40 +01:00
parent 7504b21c3e
commit b6e8b66035
17 changed files with 45 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
app/Models/Account.php
View File

@@ -51,6 +51,7 @@ class Account extends Model
'created_at' => 'datetime', 'created_at' => 'datetime',
'updated_at' => 'datetime', 'updated_at' => 'datetime',
'user_id' => 'integer', 'user_id' => 'integer',
'user_group_id' => 'integer',
'deleted_at' => 'datetime', 'deleted_at' => 'datetime',
'active' => 'boolean', 'active' => 'boolean',
'encrypted' => 'boolean', 'encrypted' => 'boolean',

4
app/Models/Attachment.php
View File

@@ -46,9 +46,11 @@ class Attachment extends Model
'updated_at' => 'datetime', 'updated_at' => 'datetime',
'deleted_at' => 'datetime', 'deleted_at' => 'datetime',
'uploaded' => 'boolean', 'uploaded' => 'boolean',
'user_id' => 'integer',
'user_group_id' => 'integer',
]; ];
protected $fillable = ['attachable_id', 'attachable_type', 'user_id', 'md5', 'filename', 'mime', 'title', 'description', 'size', 'uploaded']; protected $fillable = ['attachable_id', 'attachable_type', 'user_id','user_group_id', 'md5', 'filename', 'mime', 'title', 'description', 'size', 'uploaded'];
/** /**
* Route binder. Converts the key in the URL to the specified object (or throw 404). * Route binder. Converts the key in the URL to the specified object (or throw 404).

2
app/Models/AvailableBudget.php
View File

@@ -49,6 +49,8 @@ class AvailableBudget extends Model
'transaction_currency_id' => 'int', 'transaction_currency_id' => 'int',
'amount' => 'string', 'amount' => 'string',
'native_amount' => 'string', 'native_amount' => 'string',
'user_id' => 'integer',
'user_group_id' => 'integer',
]; ];
protected $fillable = ['user_id', 'user_group_id', 'transaction_currency_id', 'amount', 'start_date', 'end_date', 'start_date_tz', 'end_date_tz', 'native_amount']; protected $fillable = ['user_id', 'user_group_id', 'transaction_currency_id', 'amount', 'start_date', 'end_date', 'start_date_tz', 'end_date_tz', 'native_amount'];

4
app/Models/Budget.php
View File

@@ -48,9 +48,11 @@ class Budget extends Model
'deleted_at' => 'datetime', 'deleted_at' => 'datetime',
'active' => 'boolean', 'active' => 'boolean',
'encrypted' => 'boolean', 'encrypted' => 'boolean',
'user_id' => 'integer',
'user_group_id' => 'integer',
]; ];
protected $fillable = ['user_id', 'name', 'active', 'order', 'user_group_id']; protected $fillable = ['user_id','user_group_id', 'name', 'active', 'order', 'user_group_id'];
protected $hidden = ['encrypted']; protected $hidden = ['encrypted'];

2
app/Models/Category.php
View File

@@ -46,6 +46,8 @@ class Category extends Model
'updated_at' => 'datetime', 'updated_at' => 'datetime',
'deleted_at' => 'datetime', 'deleted_at' => 'datetime',
'encrypted' => 'boolean', 'encrypted' => 'boolean',
'user_id' => 'integer',
'user_group_id' => 'integer',
]; ];
protected $fillable = ['user_id', 'user_group_id', 'name']; protected $fillable = ['user_id', 'user_group_id', 'name'];

7
app/Models/CurrencyExchangeRate.php
View File

@@ -42,9 +42,10 @@ class CurrencyExchangeRate extends Model
= [ = [
'created_at' => 'datetime', 'created_at' => 'datetime',
'updated_at' => 'datetime', 'updated_at' => 'datetime',
'user_id' => 'int', 'user_id' => 'integer',
'from_currency_id' => 'int', 'user_group_id' => 'integer',
'to_currency_id' => 'int', 'from_currency_id' => 'integer',
'to_currency_id' => 'integer',
'date' => SeparateTimezoneCaster::class, 'date' => SeparateTimezoneCaster::class,
'rate' => 'string', 'rate' => 'string',
'user_rate' => 'string', 'user_rate' => 'string',

7
app/Models/GroupMembership.php
View File

@@ -36,6 +36,13 @@ class GroupMembership extends Model
use ReturnsIntegerIdTrait; use ReturnsIntegerIdTrait;
use ReturnsIntegerUserIdTrait; use ReturnsIntegerUserIdTrait;
protected $casts = [
'created_at' => 'datetime',
'updated_at' => 'datetime',
'user_id' => 'integer',
'user_group_id' => 'integer',
];
protected $fillable = ['user_id', 'user_group_id', 'user_role_id']; protected $fillable = ['user_id', 'user_group_id', 'user_role_id'];
public function user(): BelongsTo public function user(): BelongsTo

4
app/Models/InvitedUser.php
View File

@@ -41,8 +41,10 @@ class InvitedUser extends Model
= [ = [
'expires' => SeparateTimezoneCaster::class, 'expires' => SeparateTimezoneCaster::class,
'redeemed' => 'boolean', 'redeemed' => 'boolean',
'user_id' => 'integer',
'user_group_id' => 'integer',
]; ];
protected $fillable = ['user_id', 'email', 'invite_code', 'expires', 'expires_tz', 'redeemed']; protected $fillable = ['user_group_id','user_id', 'email', 'invite_code', 'expires', 'expires_tz', 'redeemed'];
/** /**
* Route binder. Converts the key in the URL to the specified object (or throw 404). * Route binder. Converts the key in the URL to the specified object (or throw 404).

3
app/Models/ObjectGroup.php
View File

@@ -42,7 +42,8 @@ class ObjectGroup extends Model
= [ = [
'created_at' => 'datetime', 'created_at' => 'datetime',
'updated_at' => 'datetime', 'updated_at' => 'datetime',
'user_id' => 'integer', 'user_id' => 'integer',
'user_group_id' => 'integer',
'deleted_at' => 'datetime', 'deleted_at' => 'datetime',
]; ];
protected $fillable = ['title', 'order', 'user_id', 'user_group_id']; protected $fillable = ['title', 'order', 'user_id', 'user_group_id'];

2
app/Models/Preference.php
View File

@@ -40,6 +40,8 @@ class Preference extends Model
'created_at' => 'datetime', 'created_at' => 'datetime',
'updated_at' => 'datetime', 'updated_at' => 'datetime',
'data' => 'array', 'data' => 'array',
'user_id' => 'integer',
'user_group_id' => 'integer',
]; ];
protected $fillable = ['user_id', 'data', 'name', 'user_group_id']; protected $fillable = ['user_id', 'data', 'name', 'user_group_id'];

4
app/Models/Recurrence.php
View File

@@ -56,10 +56,12 @@ class Recurrence extends Model
'repetitions' => 'int', 'repetitions' => 'int',
'active' => 'bool', 'active' => 'bool',
'apply_rules' => 'bool', 'apply_rules' => 'bool',
'user_id' => 'integer',
'user_group_id' => 'integer',
]; ];
protected $fillable protected $fillable
= ['user_id', 'transaction_type_id', 'title', 'description', 'first_date', 'first_date_tz', 'repeat_until', 'repeat_until_tz', 'latest_date', 'latest_date_tz', 'repetitions', 'apply_rules', 'active']; = ['user_id', 'user_group_id', 'transaction_type_id', 'title', 'description', 'first_date', 'first_date_tz', 'repeat_until', 'repeat_until_tz', 'latest_date', 'latest_date_tz', 'repetitions', 'apply_rules', 'active'];
protected $table = 'recurrences'; protected $table = 'recurrences';

4
app/Models/Rule.php
View File

@@ -49,9 +49,11 @@ class Rule extends Model
'stop_processing' => 'boolean', 'stop_processing' => 'boolean',
'id' => 'int', 'id' => 'int',
'strict' => 'boolean', 'strict' => 'boolean',
'user_id' => 'integer',
'user_group_id' => 'integer',
]; ];
protected $fillable = ['rule_group_id', 'order', 'active', 'title', 'description', 'user_id', 'strict']; protected $fillable = ['rule_group_id', 'order', 'active', 'title', 'description', 'user_id','user_group_id', 'strict'];
/** /**
* Route binder. Converts the key in the URL to the specified object (or throw 404). * Route binder. Converts the key in the URL to the specified object (or throw 404).

2
app/Models/RuleGroup.php
View File

@@ -47,6 +47,8 @@ class RuleGroup extends Model
'active' => 'boolean', 'active' => 'boolean',
'stop_processing' => 'boolean', 'stop_processing' => 'boolean',
'order' => 'int', 'order' => 'int',
'user_id' => 'integer',
'user_group_id' => 'integer',
]; ];
protected $fillable = ['user_id', 'user_group_id', 'stop_processing', 'order', 'title', 'description', 'active']; protected $fillable = ['user_id', 'user_group_id', 'stop_processing', 'order', 'title', 'description', 'active'];

2
app/Models/Tag.php
View File

@@ -49,6 +49,8 @@ class Tag extends Model
'zoomLevel' => 'int', 'zoomLevel' => 'int',
'latitude' => 'float', 'latitude' => 'float',
'longitude' => 'float', 'longitude' => 'float',
'user_id' => 'integer',
'user_group_id' => 'integer',
]; ];
protected $fillable = ['user_id', 'user_group_id', 'tag', 'date', 'date_tz', 'description', 'tagMode']; protected $fillable = ['user_id', 'user_group_id', 'tag', 'date', 'date_tz', 'description', 'tagMode'];

2
app/Models/TransactionGroup.php
View File

@@ -46,6 +46,8 @@ class TransactionGroup extends Model
'deleted_at' => 'datetime', 'deleted_at' => 'datetime',
'title' => 'string', 'title' => 'string',
'date' => 'datetime', 'date' => 'datetime',
'user_id' => 'integer',
'user_group_id' => 'integer',
]; ];
protected $fillable = ['user_id', 'user_group_id', 'title']; protected $fillable = ['user_id', 'user_group_id', 'title'];

2
app/Models/TransactionJournal.php
View File

@@ -65,6 +65,8 @@ class TransactionJournal extends Model
'tag_count' => 'int', 'tag_count' => 'int',
'encrypted' => 'boolean', 'encrypted' => 'boolean',
'completed' => 'boolean', 'completed' => 'boolean',
'user_id' => 'integer',
'user_group_id' => 'integer',
]; ];
protected $fillable protected $fillable

2
app/Models/Webhook.php
View File

@@ -48,6 +48,8 @@ class Webhook extends Model
'trigger' => 'integer', 'trigger' => 'integer',
'response' => 'integer', 'response' => 'integer',
'delivery' => 'integer', 'delivery' => 'integer',
'user_id' => 'integer',
'user_group_id' => 'integer',
]; ];
protected $fillable = ['active', 'trigger', 'response', 'delivery', 'user_id', 'user_group_id', 'url', 'title', 'secret']; protected $fillable = ['active', 'trigger', 'response', 'delivery', 'user_id', 'user_group_id', 'url', 'title', 'secret'];