Merge branch 'dev' for release 6.3.30

sleede · Jul 19, 2024 · 18f6c52 · 18f6c52
2 parents b32c4b3 + 72ebb85
commit 18f6c52
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 2 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,6 +2,10 @@
 
 ## Next release
 
+## v6.3.30 2024 July 19
+
+- Fix a bug: unable to change training reservation slot to another slot
+
 ## v6.3.29 2024 July 19
 
 - updates chinese translations and adds translations

diff --git a/app/frontend/src/javascript/controllers/trainings.js.erb b/app/frontend/src/javascript/controllers/trainings.js.erb
@@ -393,7 +393,7 @@ Application.Controllers.controller('ReserveTrainingController', ['$scope', '$tra
      */
     const refreshCalendar = function () {
       $scope.eventSources.splice(0, 1, {
-        url: `/api/availabilities/trainings/${$transition$.params().id}`,
+        url: `/api/availabilities/trainings/${$transition$.params().id}?member_id=${$scope.ctrl.member.id}`,
         textColor: 'black'
       });
     }

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "fab-manager",
-  "version": "6.3.29",
+  "version": "6.3.30",
   "description": "Fab-manager is the FabLab management solution. It provides a comprehensive, web-based, open-source tool to simplify your administrative tasks and your marker's projects.",
   "keywords": [
     "fablab",