Browse Source

DRYing

pull/837/head
natdeanlewissoftwire 3 years ago
parent
commit
8a712baced
  1. 4
      app/controllers/application_controller.rb
  2. 1
      app/controllers/case_logs_controller.rb
  3. 2
      app/controllers/organisations_controller.rb
  4. 1
      app/controllers/users_controller.rb

4
app/controllers/application_controller.rb

@ -14,4 +14,8 @@ protected
def user_for_paper_trail def user_for_paper_trail
current_user current_user
end end
def byte_order_mark
"\uFEFF"
end
end end

1
app/controllers/case_logs_controller.rb

@ -13,7 +13,6 @@ class CaseLogsController < ApplicationController
all_logs = current_user.case_logs all_logs = current_user.case_logs
unpaginated_filtered_logs = filtered_case_logs(filtered_collection(all_logs, search_term)) unpaginated_filtered_logs = filtered_case_logs(filtered_collection(all_logs, search_term))
byte_order_mark = "\uFEFF"
respond_to do |format| respond_to do |format|
format.html do format.html do

2
app/controllers/organisations_controller.rb

@ -31,7 +31,6 @@ class OrganisationsController < ApplicationController
def users def users
organisation_users = @organisation.users.sorted_by_organisation_and_role organisation_users = @organisation.users.sorted_by_organisation_and_role
unpaginated_filtered_users = filtered_collection(organisation_users, search_term) unpaginated_filtered_users = filtered_collection(organisation_users, search_term)
byte_order_mark = "\uFEFF"
respond_to do |format| respond_to do |format|
format.html do format.html do
@ -94,7 +93,6 @@ class OrganisationsController < ApplicationController
organisation_logs = CaseLog.all.where(owning_organisation_id: @organisation.id) organisation_logs = CaseLog.all.where(owning_organisation_id: @organisation.id)
unpaginated_filtered_logs = filtered_case_logs(filtered_collection(organisation_logs, search_term)) unpaginated_filtered_logs = filtered_case_logs(filtered_collection(organisation_logs, search_term))
byte_order_mark = "\uFEFF"
respond_to do |format| respond_to do |format|
format.html do format.html do

1
app/controllers/users_controller.rb

@ -12,7 +12,6 @@ class UsersController < ApplicationController
all_users = User.sorted_by_organisation_and_role all_users = User.sorted_by_organisation_and_role
filtered_users = filtered_users(all_users, search_term) filtered_users = filtered_users(all_users, search_term)
byte_order_mark = "\uFEFF"
@pagy, @users = pagy(filtered_users) @pagy, @users = pagy(filtered_users)
@searched = search_term.presence @searched = search_term.presence

Loading…
Cancel
Save