Skip to content

Fixed timestamp in action log for bulk accessory check in #16489

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Mar 12, 2025
Merged

Fixed timestamp in action log for bulk accessory check in #16489

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions app/Http/Controllers/Users/BulkUsersController.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -360,7 +360,7 @@ private function logAccessoriesCheckin(Collection $accessoryUserRows): void
$logAction->item_type = Accessory::class;
$logAction->target_id = $accessoryUserRow->assigned_to;
$logAction->target_type = User::class;
$logAction->created_at = auth()->id();
$logAction->created_by = auth()->id();
$logAction->note = 'Bulk checkin items';
$logAction->logaction('checkin from');
}
Expand All @@ -374,7 +374,7 @@ private function logConsumablesCheckin(Collection $consumableUserRows): void
$logAction->item_type = Consumable::class;
$logAction->target_id = $consumableUserRow->assigned_to;
$logAction->target_type = User::class;
$logAction->created_at = auth()->id();
$logAction->created_by = auth()->id();
Copy link
Member

@snipe snipe Mar 11, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We don't check in consumables though? Should we pull this method altogether?

Copy link
Collaborator Author

@marcusmoore marcusmoore Mar 11, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks like this was carried over in #15221 from previous behavior but yeah...we don't actually check in consumables.

Do we want to purge the action log of existing consumable checkins? If so I think we should do another PR that includes removing this and the migration to do the purge...

I'm ok if you'd rather me just pull it from here too.

Copy link
Member

@snipe snipe Mar 12, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I’ll merge this one as-is, to fix the current issue, but I think another PR + migration should come soon after. To be clear though, deleting a consumable (FCO) is a recordable (loggable) event. Deleting the consumable join to a person shouldn’t be.

Copy link
Collaborator Author

@marcusmoore marcusmoore Mar 12, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

10-4

Copy link
Collaborator Author

@marcusmoore marcusmoore Mar 12, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

For reference: #16494

$logAction->note = 'Bulk checkin items';
$logAction->logaction('checkin from');
}
Expand Down
Loading