diff --git a/app/models/report.rb b/app/models/report.rb index be204ba..a68c14d 100644 --- a/app/models/report.rb +++ b/app/models/report.rb @@ -8,6 +8,7 @@ class Report < ApplicationRecord # Provides a short human-readable description for this record, for GUI prompts alias_attribute :description, :name + default_scope { includes(%i[user]) } enum status: { pending: 0, diff --git a/app/views/reports/index.html.erb b/app/views/reports/index.html.erb index 335aa55..6aa5325 100644 --- a/app/views/reports/index.html.erb +++ b/app/views/reports/index.html.erb @@ -13,12 +13,15 @@
| Name | -Format | -Creator | -Created At | -Status | +<%= multi_sort_link( 'reports.name', 'Name', :desc) %> | +<%= multi_sort_link( :format, 'Format', :desc) %> | +<%= multi_sort_link( 'users.name', 'Creator', :desc) %> | +<%= multi_sort_link( 'reports.created_at', 'Created At', :desc) %> | +<%= multi_sort_link( :status, 'Status', :desc) %> | Output | ++ <%= link_to(t('reset_sorting'), { controller: 'reports' }, class: 'btn btn-link') if sorted? %> + | <%= reset_sorts_link %> - + | + <%- @requests.each do |record| %> diff --git a/test/system/report_index_view_test.rb b/test/system/report_index_view_test.rb new file mode 100644 index 0000000..8d76e3c --- /dev/null +++ b/test/system/report_index_view_test.rb @@ -0,0 +1,19 @@ +# frozen_string_literal: true + +require 'application_system_test_case' + +class ReportIndexViewTest < ApplicationSystemTestCase + def setup + login_admin + end + + test 'should keep page and sort when deleting' do + click_link 'admin' + click_link 'Reports' + click_link 'Name' + click_link 'Format' + click_link 'Creator' + click_link 'Created At' + assert :success + end +end
|---|