mirror of
https://github.com/scinote-eln/scinote-web.git
synced 2025-10-08 21:06:24 +08:00
Fix sorting of teams on shared inventory modal window and sorting on task assigning modal [SCI-4716] (#7051)
This commit is contained in:
parent
448a23455a
commit
71be4db51b
4 changed files with 4 additions and 1 deletions
|
@ -428,6 +428,7 @@ class ExperimentsController < ApplicationController
|
||||||
.joins(:my_modules)
|
.joins(:my_modules)
|
||||||
.where(experiments: { id: viewable_experiments })
|
.where(experiments: { id: viewable_experiments })
|
||||||
.where(my_modules: { id: assignable_my_modules })
|
.where(my_modules: { id: assignable_my_modules })
|
||||||
|
.order(:name)
|
||||||
.distinct
|
.distinct
|
||||||
.pluck(:id, :name)
|
.pluck(:id, :name)
|
||||||
|
|
||||||
|
|
|
@ -404,6 +404,7 @@ class MyModulesController < ApplicationController
|
||||||
|
|
||||||
my_modules = experiment.my_modules
|
my_modules = experiment.my_modules
|
||||||
.where(my_modules: { id: assignable_my_modules })
|
.where(my_modules: { id: assignable_my_modules })
|
||||||
|
.order(:name)
|
||||||
.pluck(:id, :name)
|
.pluck(:id, :name)
|
||||||
|
|
||||||
return render plain: [].to_json if my_modules.blank?
|
return render plain: [].to_json if my_modules.blank?
|
||||||
|
|
|
@ -110,6 +110,7 @@ class ProjectsController < ApplicationController
|
||||||
.joins(experiments: :my_modules)
|
.joins(experiments: :my_modules)
|
||||||
.where(experiments: { id: viewable_experiments })
|
.where(experiments: { id: viewable_experiments })
|
||||||
.where(my_modules: { id: assignable_my_modules })
|
.where(my_modules: { id: assignable_my_modules })
|
||||||
|
.order(:name)
|
||||||
.distinct
|
.distinct
|
||||||
.pluck(:id, :name)
|
.pluck(:id, :name)
|
||||||
|
|
||||||
|
|
|
@ -34,7 +34,7 @@
|
||||||
</span>
|
</span>
|
||||||
</div>
|
</div>
|
||||||
<div class="teams-list">
|
<div class="teams-list">
|
||||||
<% (current_user.teams - [@repository.team]).each do |t| %>
|
<% (current_user.teams.order(:name) - [@repository.team]).each do |t| %>
|
||||||
<div class="team-container">
|
<div class="team-container">
|
||||||
<div class="team-selector">
|
<div class="team-selector">
|
||||||
<span class="sci-checkbox-container">
|
<span class="sci-checkbox-container">
|
||||||
|
|
Loading…
Add table
Reference in a new issue