mirror of
https://github.com/scinote-eln/scinote-web.git
synced 2025-10-04 02:45:53 +08:00
Refactor instance method 'ordered_modules' to scope
This commit is contained in:
parent
457e9990c5
commit
686f10cbd0
4 changed files with 7 additions and 10 deletions
|
@ -74,6 +74,7 @@ class MyModule < ApplicationRecord
|
|||
Time.current.utc,
|
||||
Time.current.utc + 1.day)
|
||||
end)
|
||||
scope :workflow_ordered, -> { order(workflow_order: :asc) }
|
||||
|
||||
# A module takes this much space in canvas (x, y) in database
|
||||
WIDTH = 30
|
||||
|
|
|
@ -10,10 +10,6 @@ class MyModuleGroup < ApplicationRecord
|
|||
optional: true
|
||||
has_many :my_modules, inverse_of: :my_module_group, dependent: :nullify
|
||||
|
||||
def ordered_modules
|
||||
my_modules.order(workflow_order: :asc)
|
||||
end
|
||||
|
||||
def deep_clone_to_experiment(current_user, experiment)
|
||||
clone = MyModuleGroup.new(
|
||||
created_by: created_by,
|
||||
|
@ -21,12 +17,12 @@ class MyModuleGroup < ApplicationRecord
|
|||
)
|
||||
|
||||
# Get clones of modules from this group, save them as hash
|
||||
cloned_modules = ordered_modules.each_with_object({}) do |m, hash|
|
||||
hash[m.id] = m.deep_clone_to_experiment(current_user, experiment)
|
||||
hash
|
||||
cloned_modules = my_modules.workflow_ordered.each_with_object({}) do |m, h|
|
||||
h[m.id] = m.deep_clone_to_experiment(current_user, experiment)
|
||||
h
|
||||
end
|
||||
|
||||
ordered_modules.each do |m|
|
||||
my_modules.workflow_ordered.each do |m|
|
||||
# Copy connections
|
||||
m.inputs.each do |inp|
|
||||
Connection.create(
|
||||
|
|
|
@ -13,7 +13,7 @@
|
|||
|
||||
<% experiment.my_module_groups.each do |my_module_group| %>
|
||||
<% if my_module_group.my_modules.exists? then %>
|
||||
<% my_module_group.ordered_modules.each do |my_module| %>
|
||||
<% my_module_group.my_modules.workflow_ordered.each do |my_module| %>
|
||||
<li>
|
||||
<%= form.check_box "modules[#{my_module.id}]", label: my_module.name %>
|
||||
</li>
|
||||
|
|
|
@ -19,7 +19,7 @@
|
|||
|
||||
<% experiment.my_module_groups.each do |my_module_group| %>
|
||||
<% next unless my_module_group.my_modules.is_archived(false).exists? %>
|
||||
<% my_module_group.ordered_modules.is_archived(false).each do |my_module| %>
|
||||
<% my_module_group.my_modules.workflow_ordered.is_archived(false).each do |my_module| %>
|
||||
<li>
|
||||
<%= form.check_box "modules[#{my_module.id}]", label: my_module.name %>
|
||||
</li>
|
||||
|
|
Loading…
Add table
Reference in a new issue