aboutsummaryrefslogtreecommitdiffstats
path: root/app/models/compliance_control_block.rb
diff options
context:
space:
mode:
authorTeddy Wing2017-12-19 16:35:09 +0100
committerLuc Donnet2017-12-21 15:32:42 +0100
commit4918ffcd7492661f36a763cdf248757993f9bff4 (patch)
tree11589d965fb2b4baf5c0e4db1ff5413946f87c4d /app/models/compliance_control_block.rb
parentd9f3af834a06a6d4e73c083440926983ac5e2cfa (diff)
downloadchouette-core-4918ffcd7492661f36a763cdf248757993f9bff4.tar.bz2
Remove `hstore_accessor` usage
The places we were using `hstore_accessor` have now been converted to Postgres JSON fields. Thus we no longer need `hstore_accessor` in order to add accessors for the fields. Instead we can use Rails' built-in support for Postgres JSON fields and create accessors for our JSON hash keys with `store_accessor`. We get rid of the data types because `store_accessor` doesn't work like that and JSON already types our values with primitive data types. Finally, add some extra validation tests now that the vaildation for our JSON fields should work. Refs #5316
Diffstat (limited to 'app/models/compliance_control_block.rb')
-rw-r--r--app/models/compliance_control_block.rb6
1 files changed, 3 insertions, 3 deletions
diff --git a/app/models/compliance_control_block.rb b/app/models/compliance_control_block.rb
index e27f85ae0..d7d84fd06 100644
--- a/app/models/compliance_control_block.rb
+++ b/app/models/compliance_control_block.rb
@@ -5,9 +5,9 @@ class ComplianceControlBlock < ActiveRecord::Base
belongs_to :compliance_control_set
has_many :compliance_controls, dependent: :destroy
- hstore_accessor :condition_attributes,
- transport_mode: :string,
- transport_submode: :string
+ store_accessor :condition_attributes,
+ :transport_mode,
+ :transport_submode
validates :transport_mode, presence: true
validates :compliance_control_set, presence: true