query_report 1.0.5 → 1.0.6

data/app/views/query_report/_records.html.erb

@@ -2,7 +2,7 @@
     <table class="<%= QueryReport.config.record_table_class %>" cellpadding="0" cellspacing="0">
       <thead>
       <% report.columns.each do |column| %>
-          <th><%= column.sortable? ? sort_link(report.search, column.name, {}, remote: @remote) : column.name %></th>
+          <th><%= column.sortable? ? sort_link(report.search, column.name, {}, remote: @remote) : column.humanize %></th>
       <% end %>
       </thead>
 

data/app/views/query_report/_search.html.erb

@@ -9,5 +9,5 @@
     <%= hidden_field_tag :subject %>
     <%= hidden_field_tag :message %>
     <%= hidden_field_tag :target_dom_id, @target_dom_id %>
-    <%= f.submit 'Search', :class => QueryReport.config.search_button_class, :onclick => "$('#{@target_dom_id} #send_as_email').val(0);" %>
+    <%= f.submit t('query_report.labels.search'), :class => QueryReport.config.search_button_class, :onclick => "$('#{@target_dom_id} #send_as_email').val(0);" %>
 <% end %>

data/config/locales/query_report.yml

@@ -6,4 +6,6 @@ en:
       from: 'From'
       to: 'To'
     total:
-      Total
+      Total
+    labels:
+      search: Search

data/lib/query_report/paginate.rb

@@ -6,8 +6,12 @@
 module QueryReport
   module PaginateModule
     def apply_pagination(query, params)
-      page_method_name = Kaminari.config.page_method_name
-      query.send(page_method_name, params[:page])
+      if paginate?
+        page_method_name = Kaminari.config.page_method_name
+        query.send(page_method_name, params[:page])
+      else
+        query
+      end
     end
   end
 end

data/lib/query_report/report.rb

@@ -42,6 +42,11 @@ module QueryReport
       @columns.any?(&:has_total?)
     end
 
+    def paginate?
+      return true if @options[:paginate].nil?
+      @options[:paginate]
+    end
+
     # to support the helper methods
     def method_missing(meth, *args, &block)
       if @template.respond_to?(meth)

data/lib/query_report/version.rb

@@ -1,3 +1,3 @@
 module QueryReport
-  VERSION = "1.0.5"
+  VERSION = "1.0.6"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: query_report
 version: !ruby/object:Gem::Version
-  version: 1.0.5
+  version: 1.0.6
   prerelease: 
 platform: ruby
 authors: