diff options
Diffstat (limited to 'app')
5 files changed, 10 insertions, 11 deletions
diff --git a/app/controllers/compliance_check_sets_controller.rb b/app/controllers/compliance_check_sets_controller.rb index 7d964731d..d61fbafdb 100644 --- a/app/controllers/compliance_check_sets_controller.rb +++ b/app/controllers/compliance_check_sets_controller.rb @@ -30,7 +30,7 @@ class ComplianceCheckSetsController < BreadcrumbController start_date << params[:q][:created_at]["begin(#{key}i)"].to_i end_date << params[:q][:created_at]["end(#{key}i)"].to_i end - params[:q].delete([:created_at]) + params[:q].delete(:created_at) @begin_range = DateTime.new(*start_date, 0, 0, 0) rescue nil @end_range = DateTime.new(*end_date, 23, 59, 59) rescue nil end diff --git a/app/views/compliance_check_sets/_filters.html.slim b/app/views/compliance_check_sets/_filters.html.slim index b589e381f..609754eec 100644 --- a/app/views/compliance_check_sets/_filters.html.slim +++ b/app/views/compliance_check_sets/_filters.html.slim @@ -8,7 +8,7 @@ .ffg-row .form-group.togglable - = f.label t('activerecord.attributes.compliance_check_set.assignment'), required: false, class: 'control-label' + = f.label t('activerecord.attributes.compliance_check_set.assigned_to'), required: false, class: 'control-label' = f.input :parent_type_eq_any, collection: ComplianceCheckSet.order('parent_type'), as: :check_boxes, label: false, label_method: lambda {|w| ("<span>#{w}</span>").html_safe}, required: false, wrapper_html: {class: 'checkbox_list'} .form-group.togglable diff --git a/app/views/compliance_check_sets/index.html.slim b/app/views/compliance_check_sets/index.html.slim index 3e9b05393..38c4babcf 100644 --- a/app/views/compliance_check_sets/index.html.slim +++ b/app/views/compliance_check_sets/index.html.slim @@ -35,11 +35,11 @@ end \ ), \ TableBuilderHelper::Column.new( \ - key: :assignment, \ + key: :assigned_to, \ attribute: 'parent_type' \ ), \ TableBuilderHelper::Column.new(\ - key: :control_game, \ + key: :compliance_control_set, \ attribute: Proc.new{ |n| (n.compliance_control_set.name) if n.compliance_control_set} \ ), \ ], diff --git a/app/views/compliance_check_sets/show.html.slim b/app/views/compliance_check_sets/show.html.slim index 1b96b70fc..4e965947d 100644 --- a/app/views/compliance_check_sets/show.html.slim +++ b/app/views/compliance_check_sets/show.html.slim @@ -1,7 +1,6 @@ / PageHeader = pageheader 'jeux-de-donnees', - @compliance_check_set.referential.name, - 'Lorem ipsum dolor sit amet' + @compliance_check_set.referential.name / PageContent .page_content .container-fluid diff --git a/app/views/compliance_control_sets/index.html.slim b/app/views/compliance_control_sets/index.html.slim index aee1595ef..ecb4eb75b 100644 --- a/app/views/compliance_control_sets/index.html.slim +++ b/app/views/compliance_control_sets/index.html.slim @@ -19,7 +19,7 @@ .col-lg-12 .select_table = table_builder_2 @compliance_control_sets, - [ \ + [ \ TableBuilderHelper::Column.new( \ key: :name, \ attribute: 'name', \ @@ -28,7 +28,7 @@ end \ ), \ TableBuilderHelper::Column.new( \ - key: :assignment, \ + key: :assigned_to, \ attribute: 'assignment' \ ), \ TableBuilderHelper::Column.new( \ @@ -44,9 +44,9 @@ attribute: Proc.new { |n| l(n.updated_at, format: :long) if n.updated_at }, \ ) \ ], - sortable: true, - links: [:show], - cls: 'table has-filter has-search' + sortable: true, + links: [:show], + cls: 'table has-filter has-search' - unless @compliance_control_sets.any? .row.mt-xs .col-lg-12 |