rooty/fab-manager
1
0
Fork 0
mirror of https://github.com/LaCasemate/fab-manager.git synced 2025-01-30 19:52:20 +01:00
Code Issues Releases Activity

Fix a bug: unable to confirm modification of reservation for client

Browse Source
This commit is contained in:
Du Peng 2022-04-05 16:43:43 +02:00
parent 08b072e33c
commit 8f3f2ba083
2 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGELOG.md
View File

@ -1,6 +1,7 @@
# Changelog Fab-manager # Changelog Fab-manager
- Fix a bug: unable to show machine availability slot for admin - Fix a bug: unable to show machine availability slot for admin
- Fix a bug: unable to confirm modification of reservation for client
## v5.3.9 2022 April 01 ## v5.3.9 2022 April 01

2
app/frontend/src/javascript/controllers/machines.js.erb
View File

@ -499,7 +499,7 @@ Application.Controllers.controller('ReserveMachineController', ['$scope', '$tran
slotId: $scope.events.modifiable.slot_id, slotId: $scope.events.modifiable.slot_id,
borderColor: $scope.events.modifiable.borderColor, borderColor: $scope.events.modifiable.borderColor,
user: angular.copy($scope.events.modifiable.user), user: angular.copy($scope.events.modifiable.user),
title: $scope.currentUser.id === $scope.events.modifiable.user.id ? _t('app.logged.machines_reserve.i_ve_reserved') : _t('app.logged.machines_reserve.not_available') title: (!$scope.events.modifiable.user || $scope.currentUser.id === $scope.events.modifiable.user.id) ? _t('app.logged.machines_reserve.i_ve_reserved') : _t('app.logged.machines_reserve.not_available')
}; };
$scope.events.modifiable.backgroundColor = 'white'; $scope.events.modifiable.backgroundColor = 'white';