diff --git a/app/controllers/experiments_controller.rb b/app/controllers/experiments_controller.rb index d228f4b9e..d4613f1e1 100644 --- a/app/controllers/experiments_controller.rb +++ b/app/controllers/experiments_controller.rb @@ -286,7 +286,7 @@ class ExperimentsController < ApplicationController def load_projects_tree # Switch to correct team current_team_switch(@experiment.project.team) unless @experiment.project.nil? - @projects_tree = current_user.projects_tree(current_team, nil) + @projects_tree = current_user.projects_tree(current_team, 'atoz') end def check_view_permissions diff --git a/app/controllers/my_modules_controller.rb b/app/controllers/my_modules_controller.rb index 4221269eb..0da5713bb 100644 --- a/app/controllers/my_modules_controller.rb +++ b/app/controllers/my_modules_controller.rb @@ -582,7 +582,7 @@ class MyModulesController < ApplicationController def load_projects_tree # Switch to correct team current_team_switch(@project.team) unless @project.nil? - @projects_tree = current_user.projects_tree(current_team, nil) + @projects_tree = current_user.projects_tree(current_team, 'atoz') end def check_manage_permissions diff --git a/app/models/experiment.rb b/app/models/experiment.rb index c9d9483d3..2161052c1 100644 --- a/app/models/experiment.rb +++ b/app/models/experiment.rb @@ -19,7 +19,7 @@ class Experiment < ApplicationRecord has_many :my_modules, inverse_of: :experiment, dependent: :destroy has_many :active_my_modules, - -> { where(archived: false).order(:workflow_order) }, + -> { where(archived: false).order(:name) }, class_name: 'MyModule' has_many :my_module_groups, inverse_of: :experiment, dependent: :destroy has_many :report_elements, inverse_of: :experiment, dependent: :destroy diff --git a/app/views/shared/sidebar/_experiments.html.erb b/app/views/shared/sidebar/_experiments.html.erb index 8fa4fcaa0..7c8224986 100644 --- a/app/views/shared/sidebar/_experiments.html.erb +++ b/app/views/shared/sidebar/_experiments.html.erb @@ -1,6 +1,6 @@ <% if project.active_experiments.present? %>