diff options
| author | cedricnjanga | 2017-11-06 11:27:22 +0100 |
|---|---|---|
| committer | cedricnjanga | 2017-11-06 11:27:27 +0100 |
| commit | 2e9e199c812ed7878a894bd40c29751a9ecbad1a (patch) | |
| tree | c40fca0108aa80289fa18fa78f87a2468e943b2a | |
| parent | 49b901b7c4e7aed3f8830fdaee3977d62c3a9940 (diff) | |
| download | chouette-core-2e9e199c812ed7878a894bd40c29751a9ecbad1a.tar.bz2 | |
Refs #4837 display correctly owner_jdc in Compliance control set index and show
| -rw-r--r-- | app/views/compliance_control_sets/index.html.slim | 2 | ||||
| -rw-r--r-- | app/views/compliance_control_sets/show.html.slim | 3 |
2 files changed, 3 insertions, 2 deletions
diff --git a/app/views/compliance_control_sets/index.html.slim b/app/views/compliance_control_sets/index.html.slim index 8ea9250b3..69bff4725 100644 --- a/app/views/compliance_control_sets/index.html.slim +++ b/app/views/compliance_control_sets/index.html.slim @@ -34,7 +34,7 @@ ), \ TableBuilderHelper::Column.new( \ key: :owner_jdc, \ - attribute: 'owner_jdc' \ + attribute: Proc.new {|n| n.organisation.name } \ ), \ TableBuilderHelper::Column.new( \ key: :control_numbers, \ diff --git a/app/views/compliance_control_sets/show.html.slim b/app/views/compliance_control_sets/show.html.slim index 294df6a53..d086c07c8 100644 --- a/app/views/compliance_control_sets/show.html.slim +++ b/app/views/compliance_control_sets/show.html.slim @@ -23,7 +23,8 @@ .row .col-lg-6.col-md-6.col-sm-12.col-xs-12 = definition_list t('metadatas'), - ComplianceControlSet.human_attribute_name(:name) => @compliance_control_set.name + ComplianceControlSet.human_attribute_name(:name) => @compliance_control_set.name, + I18n.t('activerecord.attributes.compliance_control_set.owner_jdc') => @compliance_control_set.organisation.name - if params[:q].present? or @compliance_controls.any? .row .col-lg-12 |