Merge branch 'dev' for release 6.3.36

Author: gnepud

CHANGELOG.md

@@ -2,6 +2,11 @@
 
 ## Next release
 
+## v6.3.36 2024 December 12
+
+- Improvement: default order for the spaces/trainings list is set to descending by created_at
+- Improvement: members cannot see training deactivated in the list
+
 ## v6.3.35 2024 November 13
 
 - Fix a bug: unable to run rails db:migrate if the database is empty

app/controllers/api/spaces_controller.rb

@@ -7,7 +7,7 @@ class API::SpacesController < API::APIController
   respond_to :json
 
   def index
-    @spaces = Space.includes(:space_image, :machines).where(deleted_at: nil)
+    @spaces = Space.includes(:space_image, :machines).where(deleted_at: nil).order(:created_at)
     @spaces_indexed_with_parent = @spaces.index_with { |space| @spaces.find { |s| s.id == space.parent_id } }
     @spaces_grouped_by_parent_id = @spaces.group_by(&:parent_id)
   end

app/controllers/api/trainings_controller.rb

@@ -14,6 +14,7 @@ def index
 
   def show
     @training = Training.friendly.find(params[:id])
+    authorize @training
   end
 
   def create

app/policies/training_policy.rb

@@ -8,6 +8,10 @@ def resolve
     end
   end
 
+  def show?
+    !record.disabled? || user.admin? || user.manager?
+  end
+
   def create?
     user.admin?
   end

app/services/training_service.rb

@@ -5,7 +5,7 @@ class TrainingService
   class << self
     # @param filters [ActionController::Parameters]
     def list(filters)
-      trainings = Training.includes(:training_image, :plans, :machines)
+      trainings = Training.includes(:training_image, :plans, :machines).order(:created_at)
 
       trainings = filter_by_disabled(trainings, filters)
       trainings = filter_by_public_page(trainings, filters)

package.json

@@ -1,6 +1,6 @@
 {
   "name": "fab-manager",
-  "version": "6.3.35",
+  "version": "6.3.36",
   "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",