kenmirrors/firefly-iii
1
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2026-06-14 00:56:41 +00:00
Code Issues Projects Releases Wiki Activity

🤖 Auto commit for release 'develop' on 2026-06-05

Browse Source
This commit is contained in:
JC5
2026-06-05 05:46:06 +02:00
parent b1f32406cc
commit 2ba082c787
36 changed files with 232 additions and 263 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
app/Repositories/ObjectGroup/ObjectGroupRepository.php
View File

@@ -78,8 +78,7 @@ class ObjectGroupRepository implements ObjectGroupRepositoryInterface, UserGroup
public function get(): Collection
{
return $this->user
->objectGroups()
return $this->user->objectGroups()
->with(['piggyBanks', 'bills'])
->orderBy('order', 'ASC')
->orderBy('title', 'ASC')
@@ -140,8 +139,7 @@ class ObjectGroupRepository implements ObjectGroupRepositoryInterface, UserGroup
$oldOrder = $objectGroup->order;
if ($newOrder > $oldOrder) {
$this->user
->objectGroups()
$this->user->objectGroups()
->where('object_groups.order', '<=', $newOrder)
->where('object_groups.order', '>', $oldOrder)
->where('object_groups.id', '!=', $objectGroup->id)
@@ -152,8 +150,7 @@ class ObjectGroupRepository implements ObjectGroupRepositoryInterface, UserGroup
$objectGroup->save();
}
if ($newOrder < $oldOrder) {
$this->user
->objectGroups()
$this->user->objectGroups()
->where('object_groups.order', '>=', $newOrder)
->where('object_groups.order', '<', $oldOrder)
->where('object_groups.id', '!=', $objectGroup->id)