diff options
| author | Robert | 2017-11-16 07:45:22 +0100 |
|---|---|---|
| committer | Robert | 2017-11-17 14:57:36 +0100 |
| commit | 21faf9940a6f7a9f685788eba2bdd267528cb0aa (patch) | |
| tree | 00a61629e272194be43597ff4ebee6a2f1b72fe5 | |
| parent | c0fa9f7de85fe32e95c7a923bb791525e0674c5d (diff) | |
| download | chouette-core-21faf9940a6f7a9f685788eba2bdd267528cb0aa.tar.bz2 | |
Refs: #4823@0.6h; Code Review Part I
| -rw-r--r-- | app/decorators/compliance_check_decorator.rb | 2 | ||||
| -rw-r--r-- | app/views/compliance_check_sets/executed.html.slim | 73 |
2 files changed, 36 insertions, 39 deletions
diff --git a/app/decorators/compliance_check_decorator.rb b/app/decorators/compliance_check_decorator.rb index 09984aa2e..5431f5796 100644 --- a/app/decorators/compliance_check_decorator.rb +++ b/app/decorators/compliance_check_decorator.rb @@ -2,7 +2,7 @@ class ComplianceCheckDecorator < Draper::Decorator delegate_all def action_links - links = [] + [] end end diff --git a/app/views/compliance_check_sets/executed.html.slim b/app/views/compliance_check_sets/executed.html.slim index 43b1fae05..84601e17c 100644 --- a/app/views/compliance_check_sets/executed.html.slim +++ b/app/views/compliance_check_sets/executed.html.slim @@ -24,44 +24,7 @@ = transport_mode_text() .row .col-lg-12 - .select_table - = table_builder_2 @direct_compliance_checks, - [ \ - TableBuilderHelper::Column.new( \ - key: :code, \ - attribute: 'code' \ - ), \ - TableBuilderHelper::Column.new( \ - key: :name, \ - attribute: 'name', \ - link_to: lambda do |compliance_check| \ - compliance_check_path(compliance_check) \ - end \ - ), \ - TableBuilderHelper::Column.new( \ - key: :criticity, \ - attribute: 'criticity' \ - ), \ - TableBuilderHelper::Column.new( \ - key: :comment, \ - attribute: 'comment' \ - ), \ - ], - sortable: true, - cls: 'table has-filter has-search', - model: ComplianceCheck - - - @compliance_checks.each do |block, compliance_checks| - - - if compliance_checks.try(:any?) - .row - .col-lg-12 - h2 - = transport_mode_text(block) - .row - .col-lg-12 - .select_table - = table_builder_2 compliance_checks, + = table_builder_2 @direct_compliance_checks, [ \ TableBuilderHelper::Column.new( \ key: :code, \ @@ -86,4 +49,38 @@ sortable: true, cls: 'table has-filter has-search', model: ComplianceCheck + + - @compliance_checks.each do |block, compliance_checks| + - if compliance_checks.try(:any?) + .row + .col-lg-12 + h2 + = transport_mode_text(block) + .row + .col-lg-12 + = table_builder_2 compliance_checks, + [ \ + TableBuilderHelper::Column.new( \ + key: :code, \ + attribute: 'code' \ + ), \ + TableBuilderHelper::Column.new( \ + key: :name, \ + attribute: 'name', \ + link_to: lambda do |compliance_check| \ + compliance_check_path(compliance_check) \ + end \ + ), \ + TableBuilderHelper::Column.new( \ + key: :criticity, \ + attribute: 'criticity' \ + ), \ + TableBuilderHelper::Column.new( \ + key: :comment, \ + attribute: 'comment' \ + ), \ + ], + sortable: true, + cls: 'table has-filter has-search', + model: ComplianceCheck |