diff options
Diffstat (limited to 'app')
| -rw-r--r-- | app/models/compliance_control.rb | 11 | ||||
| -rw-r--r-- | app/workers/compliance_control_set_copy_worker.rb | 2 |
2 files changed, 6 insertions, 7 deletions
diff --git a/app/models/compliance_control.rb b/app/models/compliance_control.rb index 7e4e22636..6cf029b7d 100644 --- a/app/models/compliance_control.rb +++ b/app/models/compliance_control.rb @@ -16,15 +16,14 @@ class ComplianceControl < ActiveRecord::Base return true if compliance_control_block_id.nil? ids = [compliance_control_block.compliance_control_set_id, compliance_control_set_id] return true if ids.first == ids.last - errors.add(:coherent_control_set, I18n.t('compliance_controls.errors.incoherent_control_sets', indirect_set_id: ids.first, direct_set_id: ids.last)) + names = ids.map{|id| ComplianceControlSet.find(id).name} + errors.add(:coherent_control_set, + I18n.t('compliance_controls.errors.incoherent_control_sets', + indirect_set_name: names.first, + direct_set_name: names.last)) end class << self - def create *args - super.tap do | x | - require 'pry'; binding.pry - end - end def default_criticity; :warning end def default_code; "" end def dynamic_attributes diff --git a/app/workers/compliance_control_set_copy_worker.rb b/app/workers/compliance_control_set_copy_worker.rb index 4cbd4e0bc..a59ee756a 100644 --- a/app/workers/compliance_control_set_copy_worker.rb +++ b/app/workers/compliance_control_set_copy_worker.rb @@ -2,7 +2,7 @@ class ComplianceControlSetCopyWorker include Sidekiq::Worker def perform(cc_set_id, referential_id) - AF83.ComplianceControlSetCopier.new.copy(cc_set_id, referential_id) + ComplianceControlSetCopier.new.copy(cc_set_id, referential_id) end end |