diff --git a/app/assets/javascripts/controllers/machines.js.erb b/app/assets/javascripts/controllers/machines.js.erb index 49367a8cf..3f807dfaa 100644 --- a/app/assets/javascripts/controllers/machines.js.erb +++ b/app/assets/javascripts/controllers/machines.js.erb @@ -428,7 +428,7 @@ Application.Controllers.controller('ReserveMachineController', ['$scope', '$stat // indicates the state of the current view : calendar or plans information $scope.plansAreShown = false; - // will store the user's plan if he choosed to buy one + // will store the user's plan if he chose to buy one $scope.selectedPlan = null; // the moment when the plan selection changed for the last time, used to trigger changes in the cart diff --git a/app/services/availabilities/availabilities_service.rb b/app/services/availabilities/availabilities_service.rb index 4d6fd05f7..9c4b77696 100644 --- a/app/services/availabilities/availabilities_service.rb +++ b/app/services/availabilities/availabilities_service.rb @@ -101,7 +101,7 @@ class Availabilities::AvailabilitiesService end def availabilities(reservable, type, user) - if user.admin? + if user.admin? || user.manager? reservable.availabilities .includes(:tags) .where('end_at > ? AND available_type = ?', 1.month.ago, type)