diff --git a/CHANGELOG.md b/CHANGELOG.md index 475f4995b..08a63c734 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,7 @@ # Changelog Fab-manager +- Fix a bug: unable to show machine availability slot for admin + ## v5.3.9 2022 April 01 - Optimise sql query, avoid to N+1 diff --git a/app/frontend/src/javascript/directives/cart.js b/app/frontend/src/javascript/directives/cart.js index da8865547..968b169e7 100644 --- a/app/frontend/src/javascript/directives/cart.js +++ b/app/frontend/src/javascript/directives/cart.js @@ -564,7 +564,12 @@ Application.Directives.directive('cart', ['$rootScope', '$uibModal', 'dialogs', return dialogs.confirm({ templateUrl: '/shared/confirm_modify_slot_modal.html', resolve: { - object () { return $scope.slot; } + object () { + if ($scope.slot.user && !$scope.slot.user.name) { + $scope.slot.user.name = _t('app.shared.confirm_modify_slot_modal.deleted_user'); + } + return $scope.slot; + } } } , function (type) { diff --git a/app/frontend/templates/admin/calendar/calendar.html b/app/frontend/templates/admin/calendar/calendar.html index c760602ef..637579fca 100644 --- a/app/frontend/templates/admin/calendar/calendar.html +++ b/app/frontend/templates/admin/calendar/calendar.html @@ -80,7 +80,8 @@