Jelajahi Sumber

Rename "chain" to "control link" for clarity.

Akinori MUSHA 10 tahun lalu
induk
melakukan
8065721b77

+ 14 - 14
app/assets/javascripts/application.js.coffee.erb

@@ -43,15 +43,15 @@ showLinks = ->
   $(".link-region .cannot-receive-events").hide()
   showEventDescriptions()
 
-hideChains = ->
-  $(".chain-region .select2-container").hide()
-  $(".chain-region .propagate-immediately").hide()
-  $(".chain-region .cannot-receive-events").show()
+hideControlLinks = ->
+  $(".control-link-region .select2-container").hide()
+  $(".control-link-region .propagate-immediately").hide()
+  $(".control-link-region .cannot-receive-events").show()
 
-showChains = ->
-  $(".chain-region .select2-container").show()
-  $(".chain-region .propagate-immediately").show()
-  $(".chain-region .cannot-receive-events").hide()
+showControlLinks = ->
+  $(".control-link-region .select2-container").show()
+  $(".control-link-region .propagate-immediately").show()
+  $(".control-link-region .cannot-receive-events").hide()
 
 hideEventCreation = ->
   $(".event-related-region").hide()
@@ -172,9 +172,9 @@ $(document).ready ->
           hideLinks()
 
         if json.can_control_other_agents
-          showChains()
+          showControlLinks()
         else
-          hideChains()
+          hideControlLinks()
 
         if json.can_create_events
           showEventCreation()
@@ -208,11 +208,11 @@ $(document).ready ->
     else
       hideLinks()
 
-  if $(".chain-region")
-    if $(".chain-region").data("can-control-other-agents") == true
-      showChains()
+  if $(".control-link-region")
+    if $(".control-link-region").data("can-control-other-agents") == true
+      showControlLinks()
     else
-      hideChains()
+      hideControlLinks()
 
   if $(".event-related-region")
     if $(".event-related-region").data("can-create-events") == true

+ 4 - 4
app/models/agent.rb

@@ -55,10 +55,10 @@ class Agent < ActiveRecord::Base
   has_many :links_as_receiver, :dependent => :delete_all, :foreign_key => "receiver_id", :class_name => "Link", :inverse_of => :receiver
   has_many :sources, :through => :links_as_receiver, :class_name => "Agent", :inverse_of => :receivers
   has_many :receivers, :through => :links_as_source, :class_name => "Agent", :inverse_of => :sources
-  has_many :chains_as_controller, dependent: :delete_all, foreign_key: 'controller_id', class_name: 'Chain', inverse_of: :controller
-  has_many :chains_as_control_target, dependent: :delete_all, foreign_key: 'control_target_id', class_name: 'Chain', inverse_of: :control_target
-  has_many :controllers, through: :chains_as_control_target, class_name: "Agent", inverse_of: :control_targets
-  has_many :control_targets, through: :chains_as_controller, class_name: "Agent", inverse_of: :controllers
+  has_many :control_links_as_controller, dependent: :delete_all, foreign_key: 'controller_id', class_name: 'ControlLink', inverse_of: :controller
+  has_many :control_links_as_control_target, dependent: :delete_all, foreign_key: 'control_target_id', class_name: 'ControlLink', inverse_of: :control_target
+  has_many :controllers, through: :control_links_as_control_target, class_name: "Agent", inverse_of: :control_targets
+  has_many :control_targets, through: :control_links_as_controller, class_name: "Agent", inverse_of: :controllers
   has_many :scenario_memberships, :dependent => :destroy, :inverse_of => :agent
   has_many :scenarios, :through => :scenario_memberships, :inverse_of => :agents
 

+ 0 - 7
app/models/chain.rb

@@ -1,7 +0,0 @@
-# A Chain connects Agents in a run chain from the `controller` to the `target`.
-class Chain < ActiveRecord::Base
-  attr_accessible :controller_id, :target_id
-
-  belongs_to :controller, class_name: 'Agent', inverse_of: :chains_as_controller
-  belongs_to :control_target, class_name: 'Agent', inverse_of: :chains_as_control_target
-end

+ 7 - 0
app/models/control_link.rb

@@ -0,0 +1,7 @@
+# A ControlLink connects Agents in a control flow from the `controller` to the `control_target`.
+class ControlLink < ActiveRecord::Base
+  attr_accessible :controller_id, :target_id
+
+  belongs_to :controller, class_name: 'Agent', inverse_of: :control_links_as_controller
+  belongs_to :control_target, class_name: 'Agent', inverse_of: :control_links_as_control_target
+end

+ 1 - 1
app/views/agents/_form.html.erb

@@ -58,7 +58,7 @@
             </div>
           </div>
 
-          <div class="chain-region" data-can-control-other-agents="<%= @agent.can_control_other_agents? %>">
+          <div class="control-link-region" data-can-control-other-agents="<%= @agent.can_control_other_agents? %>">
             <div class="can-control-other-agents">
               <div class="form-group">
                 <%= f.label :control_targets %>

+ 5 - 0
db/migrate/20140901143732_rename_chains_to_control_links.rb

@@ -0,0 +1,5 @@
+class RenameChainsToControlLinks < ActiveRecord::Migration
+  def change
+    rename_table :chains, :control_links
+  end
+end

+ 4 - 4
db/schema.rb

@@ -11,7 +11,7 @@
 #
 # It's strongly recommended that you check this file into your version control system.
 
-ActiveRecord::Schema.define(version: 20140829081212) do
+ActiveRecord::Schema.define(version: 20140901143732) do
 
   create_table "agent_logs", force: true do |t|
     t.integer  "agent_id",                      null: false
@@ -51,15 +51,15 @@ ActiveRecord::Schema.define(version: 20140829081212) do
   add_index "agents", ["type"], name: "index_agents_on_type", using: :btree
   add_index "agents", ["user_id", "created_at"], name: "index_agents_on_user_id_and_created_at", using: :btree
 
-  create_table "chains", force: true do |t|
+  create_table "control_links", force: true do |t|
     t.integer  "controller_id"
     t.integer  "control_target_id"
     t.datetime "created_at"
     t.datetime "updated_at"
   end
 
-  add_index "chains", ["control_target_id"], name: "index_chains_on_control_target_id", using: :btree
-  add_index "chains", ["controller_id", "control_target_id"], name: "index_chains_on_controller_id_and_control_target_id", unique: true, using: :btree
+  add_index "control_links", ["control_target_id"], name: "index_control_links_on_control_target_id", using: :btree
+  add_index "control_links", ["controller_id", "control_target_id"], name: "index_control_links_on_controller_id_and_control_target_id", unique: true, using: :btree
 
   create_table "delayed_jobs", force: true do |t|
     t.integer  "priority",                    default: 0