diff options
| author | Xinhui | 2017-09-28 11:19:21 +0200 |
|---|---|---|
| committer | Xinhui | 2017-09-28 11:19:21 +0200 |
| commit | 3bcc3ffce4c9405c9150ba41248a0568a0ab2445 (patch) | |
| tree | 4ea4d4a959dda68cc3eb3fc7e38d78b00dcb465c /app | |
| parent | 57bcd99464b59ace15456776a420593cc25a45ce (diff) | |
| download | chouette-core-3bcc3ffce4c9405c9150ba41248a0568a0ab2445.tar.bz2 | |
Rework association
Diffstat (limited to 'app')
| -rw-r--r-- | app/controllers/compliance_controls_controller.rb | 2 | ||||
| -rw-r--r-- | app/models/compliance_control.rb | 3 | ||||
| -rw-r--r-- | app/models/compliance_control_block.rb | 8 |
3 files changed, 3 insertions, 10 deletions
diff --git a/app/controllers/compliance_controls_controller.rb b/app/controllers/compliance_controls_controller.rb index eb1ba68ea..846dbb253 100644 --- a/app/controllers/compliance_controls_controller.rb +++ b/app/controllers/compliance_controls_controller.rb @@ -19,7 +19,7 @@ class ComplianceControlsController < BreadcrumbController end def compliance_control_params - base = [:name, :code, :origin_code, :criticity, :comment, :control_attributes, :type, compliance_control_block_attributes: [:name, :transport_mode]] + base = [:name, :code, :origin_code, :criticity, :comment, :control_attributes, :type] permited = base + dynamic_attributes_params params.require(:compliance_control).permit(permited) end diff --git a/app/models/compliance_control.rb b/app/models/compliance_control.rb index c5389e832..42f45b6ca 100644 --- a/app/models/compliance_control.rb +++ b/app/models/compliance_control.rb @@ -1,8 +1,7 @@ class ComplianceControl < ActiveRecord::Base extend Enumerize belongs_to :compliance_control_set - has_one :compliance_control_block, dependent: :destroy - accepts_nested_attributes_for :compliance_control_block + belongs_to :compliance_control_block @@default_criticity = :warning @@default_code = "" diff --git a/app/models/compliance_control_block.rb b/app/models/compliance_control_block.rb index a08e271f6..e03c4ce85 100644 --- a/app/models/compliance_control_block.rb +++ b/app/models/compliance_control_block.rb @@ -1,15 +1,9 @@ class ComplianceControlBlock < ActiveRecord::Base belongs_to :compliance_control_set - belongs_to :compliance_control - - before_save :set_compliance_control_set + has_many :compliance_controls, dependent: :destroy hstore_accessor :condition_attributes, transport_mode: :string - def set_compliance_control_set - self.compliance_control_set = self.compliance_control.compliance_control_set - end - def self.transport_modes ["all"] + StifTransportModeEnumerations.transport_mode.values end |