Browse Source

update modules import

pull/557/head
Kat 3 years ago
parent
commit
ff30694d8a
  1. 4
      app/controllers/case_logs_controller.rb
  2. 2
      app/controllers/modules/case_logs_filter.rb
  3. 4
      app/controllers/organisations_controller.rb

4
app/controllers/case_logs_controller.rb

@ -1,8 +1,6 @@
require_relative "./modules/case_logs_filter"
class CaseLogsController < ApplicationController class CaseLogsController < ApplicationController
include Pagy::Backend include Pagy::Backend
include CaseLogsFilter include Modules::CaseLogsFilter
skip_before_action :verify_authenticity_token, if: :json_api_request? skip_before_action :verify_authenticity_token, if: :json_api_request?
before_action :authenticate, if: :json_api_request? before_action :authenticate, if: :json_api_request?

2
app/controllers/modules/case_logs_filter.rb

@ -1,4 +1,4 @@
module CaseLogsFilter module Modules::CaseLogsFilter
def filtered_case_logs(logs) def filtered_case_logs(logs)
if session[:case_logs_filters].present? if session[:case_logs_filters].present?
filters = JSON.parse(session[:case_logs_filters]) filters = JSON.parse(session[:case_logs_filters])

4
app/controllers/organisations_controller.rb

@ -1,8 +1,6 @@
require_relative "./modules/case_logs_filter"
class OrganisationsController < ApplicationController class OrganisationsController < ApplicationController
include Pagy::Backend include Pagy::Backend
include CaseLogsFilter include Modules::CaseLogsFilter
before_action :authenticate_user!, except: [:index] before_action :authenticate_user!, except: [:index]
before_action :find_resource, except: [:index] before_action :find_resource, except: [:index]

Loading…
Cancel
Save