Merge branch 'master' into 499-admin-wildcard-search

app/controllers/admin/account_activities_controller.rb

@@ -35,7 +35,8 @@ module Admin
       respond_to do |format|
         format.html
         format.csv do
-          send_data @q.result.to_csv, filename: "account_activities_#{Time.zone.now.to_formatted_s(:number)}.csv"
+          raw_csv = CsvGenerator.generate_csv(@q.result)
+          send_data raw_csv, filename: "account_activities_#{Time.zone.now.to_formatted_s(:number)}.csv"
         end
       end
 

app/controllers/admin/base_controller.rb

@@ -26,7 +26,7 @@ module Admin
       respond_to do |format|
         format.html { render page }
         format.csv do
-          raw_csv = @q.result.to_csv
+          raw_csv = CsvGenerator.generate_csv(@q.result)
           send_data raw_csv,
                     filename: "#{filename}_#{Time.zone.now.to_formatted_s(:number)}.csv",
                     type: "#{Mime[:csv]}; charset=utf-8"

app/controllers/admin/contact_versions_controller.rb

@@ -1,13 +1,13 @@
 module Admin
   class ContactVersionsController < BaseController
-    include ObjectVersionsHelper
+    include ApplicationHelper
 
     load_and_authorize_resource class: Version::ContactVersion
 
     def index
       params[:q] ||= {}
 
-      search_params = PartialSearchFormatter.format(params[:q])
+      search_params = PartialSearchFormatter.format(fix_date_params)
       versions = Version::ContactVersion.includes(:item).order(created_at: :desc, id: :desc)
       @q = versions.ransack(polymorphic_association(search_params))
 
@@ -48,5 +48,14 @@ module Admin
 
       record_type
     end
+
+    def fix_date_params
+      params_copy = params[:q].deep_dup
+      if params_copy['created_at_lteq'].present?
+        params_copy['created_at_lteq'] = Date.parse(params_copy['created_at_lteq']) + 1.day
+      end
+
+      params_copy
+    end
   end
 end

app/controllers/admin/domain_versions_controller.rb

@@ -1,7 +1,5 @@
 module Admin
   class DomainVersionsController < BaseController
-    include ObjectVersionsHelper
-
     load_and_authorize_resource class: Version::DomainVersion
 
     def index
@@ -82,9 +80,8 @@ module Admin
 
     def fix_date_params
       params_copy = params[:q].deep_dup
-      if params_copy['created_at_lteq'].present?
-        params_copy['created_at_lteq'] = Date.parse(params_copy['created_at_lteq']) + 1.day
-      end
+      created_at = params_copy['created_at_lteq']
+      params_copy['created_at_lteq'] = Date.parse(created_at) + 1.day if created_at.present?
 
       params_copy
     end