Rename "chain" to "control link" for clarity.
Akinori MUSHA
7 измененных файлов с 35 добавлено и 30 удалено
+ 14
- 14
app/assets/javascripts/application.js.coffee.erb
@@ -43,15 +43,15 @@ showLinks = -> |
||
| 43 | 43 |
$(".link-region .cannot-receive-events").hide()
|
| 44 | 44 |
showEventDescriptions() |
| 45 | 45 |
|
| 46 |
-hideChains = -> |
|
| 47 |
- $(".chain-region .select2-container").hide()
|
|
| 48 |
- $(".chain-region .propagate-immediately").hide()
|
|
| 49 |
- $(".chain-region .cannot-receive-events").show()
|
|
| 46 |
+hideControlLinks = -> |
|
| 47 |
+ $(".control-link-region .select2-container").hide()
|
|
| 48 |
+ $(".control-link-region .propagate-immediately").hide()
|
|
| 49 |
+ $(".control-link-region .cannot-receive-events").show()
|
|
| 50 | 50 |
|
| 51 |
-showChains = -> |
|
| 52 |
- $(".chain-region .select2-container").show()
|
|
| 53 |
- $(".chain-region .propagate-immediately").show()
|
|
| 54 |
- $(".chain-region .cannot-receive-events").hide()
|
|
| 51 |
+showControlLinks = -> |
|
| 52 |
+ $(".control-link-region .select2-container").show()
|
|
| 53 |
+ $(".control-link-region .propagate-immediately").show()
|
|
| 54 |
+ $(".control-link-region .cannot-receive-events").hide()
|
|
| 55 | 55 |
|
| 56 | 56 |
hideEventCreation = -> |
| 57 | 57 |
$(".event-related-region").hide()
|
@@ -172,9 +172,9 @@ $(document).ready -> |
||
| 172 | 172 |
hideLinks() |
| 173 | 173 |
|
| 174 | 174 |
if json.can_control_other_agents |
| 175 |
- showChains() |
|
| 175 |
+ showControlLinks() |
|
| 176 | 176 |
else |
| 177 |
- hideChains() |
|
| 177 |
+ hideControlLinks() |
|
| 178 | 178 |
|
| 179 | 179 |
if json.can_create_events |
| 180 | 180 |
showEventCreation() |
@@ -208,11 +208,11 @@ $(document).ready -> |
||
| 208 | 208 |
else |
| 209 | 209 |
hideLinks() |
| 210 | 210 |
|
| 211 |
- if $(".chain-region")
|
|
| 212 |
- if $(".chain-region").data("can-control-other-agents") == true
|
|
| 213 |
- showChains() |
|
| 211 |
+ if $(".control-link-region")
|
|
| 212 |
+ if $(".control-link-region").data("can-control-other-agents") == true
|
|
| 213 |
+ showControlLinks() |
|
| 214 | 214 |
else |
| 215 |
- hideChains() |
|
| 215 |
+ hideControlLinks() |
|
| 216 | 216 |
|
| 217 | 217 |
if $(".event-related-region")
|
| 218 | 218 |
if $(".event-related-region").data("can-create-events") == true
|
+ 4
- 4
app/models/agent.rb
@@ -55,10 +55,10 @@ class Agent < ActiveRecord::Base |
||
| 55 | 55 |
has_many :links_as_receiver, :dependent => :delete_all, :foreign_key => "receiver_id", :class_name => "Link", :inverse_of => :receiver |
| 56 | 56 |
has_many :sources, :through => :links_as_receiver, :class_name => "Agent", :inverse_of => :receivers |
| 57 | 57 |
has_many :receivers, :through => :links_as_source, :class_name => "Agent", :inverse_of => :sources |
| 58 |
- has_many :chains_as_controller, dependent: :delete_all, foreign_key: 'controller_id', class_name: 'Chain', inverse_of: :controller |
|
| 59 |
- has_many :chains_as_control_target, dependent: :delete_all, foreign_key: 'control_target_id', class_name: 'Chain', inverse_of: :control_target |
|
| 60 |
- has_many :controllers, through: :chains_as_control_target, class_name: "Agent", inverse_of: :control_targets |
|
| 61 |
- has_many :control_targets, through: :chains_as_controller, class_name: "Agent", inverse_of: :controllers |
|
| 58 |
+ has_many :control_links_as_controller, dependent: :delete_all, foreign_key: 'controller_id', class_name: 'ControlLink', inverse_of: :controller |
|
| 59 |
+ has_many :control_links_as_control_target, dependent: :delete_all, foreign_key: 'control_target_id', class_name: 'ControlLink', inverse_of: :control_target |
|
| 60 |
+ has_many :controllers, through: :control_links_as_control_target, class_name: "Agent", inverse_of: :control_targets |
|
| 61 |
+ has_many :control_targets, through: :control_links_as_controller, class_name: "Agent", inverse_of: :controllers |
|
| 62 | 62 |
has_many :scenario_memberships, :dependent => :destroy, :inverse_of => :agent |
| 63 | 63 |
has_many :scenarios, :through => :scenario_memberships, :inverse_of => :agents |
| 64 | 64 |
|
+ 0
- 7
app/models/chain.rb
@@ -1,7 +0,0 @@ |
||
| 1 |
-# A Chain connects Agents in a run chain from the `controller` to the `target`. |
|
| 2 |
-class Chain < ActiveRecord::Base |
|
| 3 |
- attr_accessible :controller_id, :target_id |
|
| 4 |
- |
|
| 5 |
- belongs_to :controller, class_name: 'Agent', inverse_of: :chains_as_controller |
|
| 6 |
- belongs_to :control_target, class_name: 'Agent', inverse_of: :chains_as_control_target |
|
| 7 |
-end |
+ 7
- 0
app/models/control_link.rb
@@ -0,0 +1,7 @@ |
||
| 1 |
+# A ControlLink connects Agents in a control flow from the `controller` to the `control_target`. |
|
| 2 |
+class ControlLink < ActiveRecord::Base |
|
| 3 |
+ attr_accessible :controller_id, :target_id |
|
| 4 |
+ |
|
| 5 |
+ belongs_to :controller, class_name: 'Agent', inverse_of: :control_links_as_controller |
|
| 6 |
+ belongs_to :control_target, class_name: 'Agent', inverse_of: :control_links_as_control_target |
|
| 7 |
+end |
+ 1
- 1
app/views/agents/_form.html.erb
@@ -58,7 +58,7 @@ |
||
| 58 | 58 |
</div> |
| 59 | 59 |
</div> |
| 60 | 60 |
|
| 61 |
- <div class="chain-region" data-can-control-other-agents="<%= @agent.can_control_other_agents? %>"> |
|
| 61 |
+ <div class="control-link-region" data-can-control-other-agents="<%= @agent.can_control_other_agents? %>"> |
|
| 62 | 62 |
<div class="can-control-other-agents"> |
| 63 | 63 |
<div class="form-group"> |
| 64 | 64 |
<%= f.label :control_targets %> |
+ 5
- 0
db/migrate/20140901143732_rename_chains_to_control_links.rb
@@ -0,0 +1,5 @@ |
||
| 1 |
+class RenameChainsToControlLinks < ActiveRecord::Migration |
|
| 2 |
+ def change |
|
| 3 |
+ rename_table :chains, :control_links |
|
| 4 |
+ end |
|
| 5 |
+end |
+ 4
- 4
db/schema.rb
@@ -11,7 +11,7 @@ |
||
| 11 | 11 |
# |
| 12 | 12 |
# It's strongly recommended that you check this file into your version control system. |
| 13 | 13 |
|
| 14 |
-ActiveRecord::Schema.define(version: 20140829081212) do |
|
| 14 |
+ActiveRecord::Schema.define(version: 20140901143732) do |
|
| 15 | 15 |
|
| 16 | 16 |
create_table "agent_logs", force: true do |t| |
| 17 | 17 |
t.integer "agent_id", null: false |
@@ -51,15 +51,15 @@ ActiveRecord::Schema.define(version: 20140829081212) do |
||
| 51 | 51 |
add_index "agents", ["type"], name: "index_agents_on_type", using: :btree |
| 52 | 52 |
add_index "agents", ["user_id", "created_at"], name: "index_agents_on_user_id_and_created_at", using: :btree |
| 53 | 53 |
|
| 54 |
- create_table "chains", force: true do |t| |
|
| 54 |
+ create_table "control_links", force: true do |t| |
|
| 55 | 55 |
t.integer "controller_id" |
| 56 | 56 |
t.integer "control_target_id" |
| 57 | 57 |
t.datetime "created_at" |
| 58 | 58 |
t.datetime "updated_at" |
| 59 | 59 |
end |
| 60 | 60 |
|
| 61 |
- add_index "chains", ["control_target_id"], name: "index_chains_on_control_target_id", using: :btree |
|
| 62 |
- add_index "chains", ["controller_id", "control_target_id"], name: "index_chains_on_controller_id_and_control_target_id", unique: true, using: :btree |
|
| 61 |
+ add_index "control_links", ["control_target_id"], name: "index_control_links_on_control_target_id", using: :btree |
|
| 62 |
+ add_index "control_links", ["controller_id", "control_target_id"], name: "index_control_links_on_controller_id_and_control_target_id", unique: true, using: :btree |
|
| 63 | 63 |
|
| 64 | 64 |
create_table "delayed_jobs", force: true do |t| |
| 65 | 65 |
t.integer "priority", default: 0 |