diff options
| author | Luc Donnet | 2017-10-14 18:22:45 +0200 |
|---|---|---|
| committer | Luc Donnet | 2017-10-14 18:23:16 +0200 |
| commit | 584bc2b59ecf95ee1021596e8f3583d9af97a5a7 (patch) | |
| tree | d68bc9fefb0102c92e501f9b541987125dc94f29 /app/views | |
| parent | 16e9fe5e4e75f2df98f0da371062d572fa45a48b (diff) | |
| download | chouette-core-584bc2b59ecf95ee1021596e8f3583d9af97a5a7.tar.bz2 | |
Fix translations for compliance_control type translation, compliance_control validation, compliance_control module
Diffstat (limited to 'app/views')
| -rw-r--r-- | app/views/compliance_controls/_form.html.slim | 4 | ||||
| -rw-r--r-- | app/views/compliance_controls/select_type.html.slim | 4 | ||||
| -rw-r--r-- | app/views/compliance_controls/show.html.slim | 4 |
3 files changed, 6 insertions, 6 deletions
diff --git a/app/views/compliance_controls/_form.html.slim b/app/views/compliance_controls/_form.html.slim index 8c56d145f..1ebbe8802 100644 --- a/app/views/compliance_controls/_form.html.slim +++ b/app/views/compliance_controls/_form.html.slim @@ -2,14 +2,14 @@ .row .col-lg-12 = f.input :name - = f.input :type, as: :select, collection: ComplianceControl.subclasses, disabled: true + = f.input :type, as: :hidden = f.input :code = f.input :criticity = f.association :compliance_control_block, collection: @compliance_control_set.compliance_control_blocks, label_method: :label_method = f.input :comment - f.object.class.dynamic_attributes.each do |attribute| - if attribute == :target - = f.input :target, as: :grouped_select, collection: ModelAttribute.grouped_options(@compliance_control.class.attribute_type), :group_method => :last + = f.input :target, as: :grouped_select, collection: ModelAttribute.grouped_options(@compliance_control.class.attribute_type), group_method: :last, include_blank: false - else = f.input attribute.to_sym end diff --git a/app/views/compliance_controls/select_type.html.slim b/app/views/compliance_controls/select_type.html.slim index 72ac41dc9..a4ae1ed27 100644 --- a/app/views/compliance_controls/select_type.html.slim +++ b/app/views/compliance_controls/select_type.html.slim @@ -12,7 +12,7 @@ = form_tag(new_compliance_control_set_compliance_control_path, method: :get) do - @sti_subclasses.each do |klass| .radio - = radio_button_tag(:sti_class, klass) - = I18n.t("activerecord.models.#{klass.name.underscore}.one") + = radio_button_tag(:sti_class, klass, @sti_subclasses.first) + = "#{klass.default_code} - #{I18n.t("activerecord.models.#{klass.name.underscore}.one")}" .text-right = submit_tag t('compliance_control_sets.actions.loaded'), class: "btn btn-outline-primary" diff --git a/app/views/compliance_controls/show.html.slim b/app/views/compliance_controls/show.html.slim index 7affcf2a3..2cf8051fc 100644 --- a/app/views/compliance_controls/show.html.slim +++ b/app/views/compliance_controls/show.html.slim @@ -16,8 +16,8 @@ ComplianceControl.human_attribute_name(:comment) => @compliance_control.comment, }.merge( \ {}.tap do |hash| \ - @compliance_control.control_attributes.each do |k, v| \ - hash[ComplianceControl.human_attribute_name(k)] = v \ + @compliance_control.class.dynamic_attributes.each do |attribute| \ + hash[ComplianceControl.human_attribute_name(attribute)] = @compliance_control.send(attribute) \ end \ end \ ) |