From adeb3acd79f848609e1f6e19d8a99777a4918bac Mon Sep 17 00:00:00 2001 From: Du Peng Date: Thu, 12 Dec 2024 12:10:45 +0100 Subject: [PATCH] (feat) default order for the spaces/trainings list is set to descending by created_at --- CHANGELOG.md | 2 ++ app/controllers/api/spaces_controller.rb | 2 +- app/services/training_service.rb | 2 +- 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index bb4b2587d..641d47789 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,8 @@ ## Next release +- Improvement: default order for the spaces/trainings list is set to descending by created_at + ## v6.3.35 2024 November 13 - Fix a bug: unable to run rails db:migrate if the database is empty diff --git a/app/controllers/api/spaces_controller.rb b/app/controllers/api/spaces_controller.rb index d6a2ea8ae..ba9e84993 100644 --- a/app/controllers/api/spaces_controller.rb +++ b/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 diff --git a/app/services/training_service.rb b/app/services/training_service.rb index ec9bfc434..690e681cb 100644 --- a/app/services/training_service.rb +++ b/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)