diff options
| author | Luc Donnet | 2018-01-10 22:28:19 +0100 |
|---|---|---|
| committer | Luc Donnet | 2018-01-10 22:28:46 +0100 |
| commit | 6f6488d1e589261d0bf6aef0020d1ac3478107d0 (patch) | |
| tree | 3930a6b786f0445ed89d3b7a27203ce8548b35c1 /app | |
| parent | 21ab06ce232b41e4582b4339c872c423b36115d3 (diff) | |
| download | chouette-core-6f6488d1e589261d0bf6aef0020d1ac3478107d0.tar.bz2 | |
Fix compliance controls, compliance check sets access with table hack for object outside referential Refs #5540 @3
Diffstat (limited to 'app')
| -rw-r--r-- | app/models/calendar.rb | 2 | ||||
| -rw-r--r-- | app/models/compliance_check_set.rb | 2 | ||||
| -rw-r--r-- | app/models/compliance_control_set.rb | 2 | ||||
| -rw-r--r-- | app/models/public_version.rb | 4 |
4 files changed, 7 insertions, 3 deletions
diff --git a/app/models/calendar.rb b/app/models/calendar.rb index 34ed51374..a7fd9220c 100644 --- a/app/models/calendar.rb +++ b/app/models/calendar.rb @@ -6,7 +6,7 @@ class Calendar < ActiveRecord::Base include DateSupport include PeriodSupport - has_paper_trail + has_paper_trail class_name: 'PublicVersion' belongs_to :organisation validates_presence_of :name, :short_name, :organisation diff --git a/app/models/compliance_check_set.rb b/app/models/compliance_check_set.rb index 020100f4a..63f380d99 100644 --- a/app/models/compliance_check_set.rb +++ b/app/models/compliance_check_set.rb @@ -1,6 +1,6 @@ class ComplianceCheckSet < ActiveRecord::Base extend Enumerize - has_paper_trail + has_paper_trail class_name: 'PublicVersion' belongs_to :referential belongs_to :compliance_control_set diff --git a/app/models/compliance_control_set.rb b/app/models/compliance_control_set.rb index 41076fefc..c0ea692f2 100644 --- a/app/models/compliance_control_set.rb +++ b/app/models/compliance_control_set.rb @@ -1,5 +1,5 @@ class ComplianceControlSet < ActiveRecord::Base - has_paper_trail + has_paper_trail class_name: 'PublicVersion' belongs_to :organisation has_many :compliance_control_blocks, dependent: :destroy has_many :compliance_controls, dependent: :destroy diff --git a/app/models/public_version.rb b/app/models/public_version.rb new file mode 100644 index 000000000..4dbf6ce27 --- /dev/null +++ b/app/models/public_version.rb @@ -0,0 +1,4 @@ +class PublicVersion < PaperTrail::Version + # custom behaviour, e.g: + self.table_name = :'public.versions' +end |