From cb6d4702ed8b54b5bcf179798aaeced504926552 Mon Sep 17 00:00:00 2001 From: Du Peng Date: Fri, 19 Jul 2024 17:24:48 +0200 Subject: [PATCH 1/2] (bug) unable to change training reservation slot to another slot --- CHANGELOG.md | 2 ++ app/frontend/src/javascript/controllers/trainings.js.erb | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 918ef12f2..8609fdaa1 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,8 @@ ## Next release +- 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 index ae6671111..b0496d164 100644 --- 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' }); } From 72ebb851f7ccd8c7eafe0ae95952ecb587467faa Mon Sep 17 00:00:00 2001 From: Du Peng Date: Fri, 19 Jul 2024 17:25:54 +0200 Subject: [PATCH 2/2] Version 6.3.30 --- CHANGELOG.md | 2 ++ package.json | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 8609fdaa1..69516ef4f 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,8 @@ ## 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 diff --git a/package.json b/package.json index bd75e4b32..c15bf52d8 100644 --- 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",