diff options
| author | cedricnjanga | 2018-03-28 07:05:11 -0700 |
|---|---|---|
| committer | cedricnjanga | 2018-03-28 07:05:11 -0700 |
| commit | 0fe85a4effbfddff399d09d41ed929c235ed310d (patch) | |
| tree | 93dd12db72f4976cdd0ec8312b9cd923b4b10f0d | |
| parent | 44e74d3194fb9543cde855bb22b33aa0d565bd60 (diff) | |
| download | chouette-core-0fe85a4effbfddff399d09d41ed929c235ed310d.tar.bz2 | |
Refs #5855 Fix typos and change validation method namenew-uniqueness-validation-for-ccblocks
| -rw-r--r-- | app/controllers/compliance_control_blocks_controller.rb | 4 | ||||
| -rw-r--r-- | config/locales/compliance_control_blocks.fr.yml | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/app/controllers/compliance_control_blocks_controller.rb b/app/controllers/compliance_control_blocks_controller.rb index 526600849..b5ba2d65d 100644 --- a/app/controllers/compliance_control_blocks_controller.rb +++ b/app/controllers/compliance_control_blocks_controller.rb @@ -4,9 +4,9 @@ class ComplianceControlBlocksController < ChouetteController belongs_to :compliance_control_set actions :all, :except => [:show, :index] - after_action :check_duplicate, only: [:create, :update] + after_action :display_errors, only: [:create, :update] - def check_duplicate + def display_errors unless @compliance_control_block.errors[:condition_attributes].empty? flash[:error] = @compliance_control_block.errors[:condition_attributes].join(', ') end diff --git a/config/locales/compliance_control_blocks.fr.yml b/config/locales/compliance_control_blocks.fr.yml index 9ae5e9c9c..5ce5b4729 100644 --- a/config/locales/compliance_control_blocks.fr.yml +++ b/config/locales/compliance_control_blocks.fr.yml @@ -14,7 +14,7 @@ fr: compliance_control_block: attributes: condition_attributes: - taken: Un groupe de contrôle identique existe déjà au sein de ce jeux de contrôles + taken: Un groupe de contrôle identique existe déjà au sein de ce jeu de contrôles compliance_control_blocks: clone: prefix: 'Copie de' |