scinote-eln/scinote-web
1
1
Fork 0
mirror of https://github.com/scinote-eln/scinote-web.git synced 2024-09-20 14:45:56 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #3176 from aignatov-bio/ai-sci-5508-fix-error-on-canvas

Browse source 
Fix normalize_module_position method [SCI-5508]
This commit is contained in:
aignatov-bio 2021-02-22 10:08:50 +01:00 committed by GitHub
parent 51a5a835ae 58a5126a13
commit ca0be11f82
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 6 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/controllers/experiments_controller.rb
View file

@ -65,7 +65,7 @@ class ExperimentsController < ApplicationController
def canvas
redirect_to module_archive_experiment_path(@experiment) if @experiment.archived_branch?
@project = @experiment.project
@active_modules = @experiment.my_modules.active.includes(:tags, :inputs, :outputs)
@active_modules = @experiment.my_modules.active.order(:name).includes(:tags, :inputs, :outputs)
current_team_switch(@project.team)
end

6
app/models/experiment.rb
View file

@ -471,7 +471,11 @@ class Experiment < ApplicationRecord
x_diff = my_modules.active.pluck(:x).min
y_diff = my_modules.active.pluck(:y).min
my_modules.active.each do |m|
moving_direction = {
x: x_diff.positive? ? :asc : :desc,
y: y_diff.positive? ? :asc : :desc
}
my_modules.active.order(moving_direction).each do |m|
m.update!(x: m.x - x_diff, y: m.y - y_diff)
end
my_modules.reload