helpdesk 0.0.31 → 0.0.32

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d67332e83f1fe55016bd1540a32cb5cc4fec9bd2
-  data.tar.gz: 69fd17578fdd0cb2843e0fffd81a67e066fa6c2d
+  metadata.gz: f5774eee15a747870a6764b6f08d56985013fda3
+  data.tar.gz: fce9ece3fa9b77a167aca6a79f8a66abe5c533df
 SHA512:
-  metadata.gz: ab37716c9dff6baff0d6a5b4dca6d1282349189b60d9d80eb56203c25a0db82880af784b68ccd096f3d58b504c5ff6a3d85fbe3e46e4a476c9ee0bdaa4c533f5
-  data.tar.gz: 24b5a0c85346f2a5ac04a79a428c93c06b225027c69c2f4287e57eeaa354e965e935d16da4814b2ad66b6a18db9ba4ada5e555002ef5008405567748a1a1454d
+  metadata.gz: f8625606b2a2317649091cd778c8441688f0a235b6f30665831f54cbb31c751aef6bdf74b30203e0f2f5e654279f9e017af5b9cc35496b048b32cb7639f651ee
+  data.tar.gz: e37ef007f4afcaeac5012ebacd09b97cf0a86416fd10536f380fa6d322cbb14045c7c28f4f49c41ddead7726a97b10b300966bb3022105d52ddee991b70692cb

data/app/controllers/helpdesk/faqs_controller.rb

@@ -2,7 +2,7 @@ module Helpdesk
   class FaqsController < Helpdesk::ApplicationController
 
     def search
-      @faqs = Helpdesk::Faq.search(params[:search])
+      @faqs = Helpdesk::Faq.search(params[:search],params[:page])
     end
 
     def index

data/app/models/helpdesk/faq.rb

@@ -23,7 +23,7 @@ module Helpdesk
       arel_faqs_t = Arel::Table.new(:helpdesk_faq_translations)
       name_match = arel_faqs_t[:title].matches(query)
       postal_match = arel_faqs_t[:text].matches(query)
-      with_translations.active.where(name_match.or(postal_match)).page(page).per_page(5)
+      with_translations.active.where(name_match.or(postal_match)).page(page)
     end
 
     def anchor

data/app/views/helpdesk/faqs/search.html.haml

@@ -7,7 +7,7 @@
   %div.pageContainer
     - if params[:search]
       .alert.alert-info
-        = t('helpdesk.faqs.search_count', count: @faqs.size, query:params[:search])
+        = t('helpdesk.faqs.search_count', count: @faqs.total_count, query:params[:search])
 
     %h1
       = t('helpdesk.faqs.title_s')
@@ -25,3 +25,4 @@
 
             = highlight("..."+faq.text[start_index,params[:search].length+40].strip+"...", params[:search], highlighter: '<strong>\1</strong>')
 
+      =paginate @faqs

data/lib/helpdesk/version.rb

@@ -1,3 +1,3 @@
 module Helpdesk
-  VERSION = "0.0.31"
+  VERSION = "0.0.32"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: helpdesk
 version: !ruby/object:Gem::Version
-  version: 0.0.31
+  version: 0.0.32
 platform: ruby
 authors:
 - John Beynon Wacław Łuczak
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-11-06 00:00:00.000000000 Z
+date: 2014-11-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: launchy