rooty/fab-manager
1
0
Fork 0
mirror of https://github.com/LaCasemate/fab-manager.git synced 2025-02-19 13:54:25 +01:00
Code Issues Releases Activity

fix bug: user validation required alert is displayed and disappears instantly

Browse Source
This commit is contained in:
Du Peng 2022-07-27 13:16:51 +02:00
parent 5d6dc2a142
commit 677b796d32
4 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGELOG.md
View File

@ -9,6 +9,7 @@
- Usage of the rails logger instead of printing to standard output
- Optionnaly add a username column to the member list (#375)
- Improved attached ICS file texts, in reservations emails
- Fix a bug: user validation required alert is displayed and disappears instantly
- Fix a bug: canceled trainings are still shown on the public profile page
- Fix a bug: prevent same slot booking feature ignores canceled reservations
- Fix a bug: wrong currency on invoices files

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

@ -647,6 +647,7 @@ Application.Controllers.controller('ReserveMachineController', ['$scope', '$tran
});
if ($scope.currentUser.role !== 'admin') {
$scope.ctrl.member = $scope.currentUser;
return Member.get({ id: $scope.currentUser.id }, function (member) { $scope.ctrl.member = member; });
}
};

1
app/frontend/src/javascript/controllers/spaces.js.erb
View File

@ -558,6 +558,7 @@ Application.Controllers.controller('ReserveSpaceController', ['$scope', '$transi
*/
const initialize = function () {
if ($scope.currentUser.role !== 'admin') {
$scope.ctrl.member = $scope.currentUser;
Member.get({ id: $scope.currentUser.id }, function (member) { $scope.ctrl.member = member; });
}
// we load the availabilities from a callback function of the $scope.eventSources, instead of resolving a promise

1
app/frontend/src/javascript/controllers/trainings.js.erb
View File

@ -345,6 +345,7 @@ Application.Controllers.controller('ReserveTrainingController', ['$scope', '$tra
*/
const initialize = function () {
if ($scope.currentUser.role !== 'admin') {
$scope.ctrl.member = $scope.currentUser;
Member.get({ id: $scope.currentUser.id }, function (member) { $scope.ctrl.member = member; });
}
// we load the availabilities from a callback function of the $scope.eventSources, instead of resolving a promise