From e3d2b5376789a453b7a6caa16cd3bfcfde2e62f5 Mon Sep 17 00:00:00 2001
From: Du Peng <gnepud@gmail.com>
Date: Fri, 13 May 2022 12:24:52 +0200
Subject: [PATCH] Fix a bug: when machines module disabled, Associated machines
 is still shown in trainings list

---
 CHANGELOG.md                                               | 2 ++
 app/frontend/src/javascript/controllers/admin/trainings.js | 2 ++
 app/frontend/src/javascript/router.js                      | 2 +-
 app/frontend/templates/admin/trainings/index.html          | 4 ++--
 4 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 98193f5d6..f7d065a24 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,8 @@
 
 ## next deploy
 
+- Fix a bug: when machines module disabled, Associated machines is still shown in trainings list
+
 ## v5.4.0 2022 May 12
 
 - Option to disable the 'machines' module
diff --git a/app/frontend/src/javascript/controllers/admin/trainings.js b/app/frontend/src/javascript/controllers/admin/trainings.js
index 9e95fd31b..6342f26fd 100644
--- a/app/frontend/src/javascript/controllers/admin/trainings.js
+++ b/app/frontend/src/javascript/controllers/admin/trainings.js
@@ -187,6 +187,8 @@ Application.Controllers.controller('TrainingsAdminController', ['$scope', '$stat
     // default tab: trainings list
     $scope.tabs = { active: 0 };
 
+    $scope.enableMachinesModule = settingsPromise.machines_module === 'true';
+
     /**
      * In the trainings listing tab, return the stringified list of machines associated with the provided training
      * @param training {Object} Training object, inherited from $resource
diff --git a/app/frontend/src/javascript/router.js b/app/frontend/src/javascript/router.js
index b52874d70..89f1a9176 100644
--- a/app/frontend/src/javascript/router.js
+++ b/app/frontend/src/javascript/router.js
@@ -670,7 +670,7 @@ angular.module('application.router', ['ui.router'])
         resolve: {
           trainingsPromise: ['Training', function (Training) { return Training.query().$promise; }],
           machinesPromise: ['Machine', function (Machine) { return Machine.query().$promise; }],
-          settingsPromise: ['Setting', function (Setting) { return Setting.query({ names: "['feature_tour_display']" }).$promise; }]
+          settingsPromise: ['Setting', function (Setting) { return Setting.query({ names: "['feature_tour_display', 'machines_module']" }).$promise; }]
         }
       })
       .state('app.admin.trainings_new', {
diff --git a/app/frontend/templates/admin/trainings/index.html b/app/frontend/templates/admin/trainings/index.html
index 786dd1d80..48cae7e1e 100644
--- a/app/frontend/templates/admin/trainings/index.html
+++ b/app/frontend/templates/admin/trainings/index.html
@@ -53,7 +53,7 @@
             <thead>
             <tr>
               <th style="width:20%" translate>{{ 'app.admin.trainings.name' }}</th>
-              <th style="width:40%" translate>{{ 'app.admin.trainings.associated_machines' }}</th>
+              <th ng-if="enableMachinesModule" style="width:40%" translate>{{ 'app.admin.trainings.associated_machines' }}</th>
               <th style="width:20%" translate>{{ 'app.admin.trainings.number_of_tickets' }}</th>
               <th style="width:20%"></th>
             </tr>
@@ -61,7 +61,7 @@
             <tbody>
             <tr ng-repeat="training in trainings | filterDisabled:trainingFiltering" ng-class="{'disabled-line' : training.disabled && trainingFiltering === 'all'}">
               <td>{{ training.name }}</td>
-              <td>{{ showMachines(training) }}</td>
+              <td ng-if="enableMachinesModule">{{ showMachines(training) }}</td>
               <td>{{ training.nb_total_places }}</td>
               <td>
                 <div class="buttons" ng-show="isAuthorized('admin')">