helpdesk 0.0.31 → 0.0.32

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (6) hide show
  1. checksums.yaml +4 -4
  2. data/app/controllers/helpdesk/faqs_controller.rb +1 -1
  3. data/app/models/helpdesk/faq.rb +1 -1
  4. data/app/views/helpdesk/faqs/search.html.haml +2 -1
  5. data/lib/helpdesk/version.rb +1 -1
  6. metadata +2 -2
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA1:
3
- metadata.gz: d67332e83f1fe55016bd1540a32cb5cc4fec9bd2
4
- data.tar.gz: 69fd17578fdd0cb2843e0fffd81a67e066fa6c2d
3
+ metadata.gz: f5774eee15a747870a6764b6f08d56985013fda3
4
+ data.tar.gz: fce9ece3fa9b77a167aca6a79f8a66abe5c533df
5
5
  SHA512:
6
- metadata.gz: ab37716c9dff6baff0d6a5b4dca6d1282349189b60d9d80eb56203c25a0db82880af784b68ccd096f3d58b504c5ff6a3d85fbe3e46e4a476c9ee0bdaa4c533f5
7
- data.tar.gz: 24b5a0c85346f2a5ac04a79a428c93c06b225027c69c2f4287e57eeaa354e965e935d16da4814b2ad66b6a18db9ba4ada5e555002ef5008405567748a1a1454d
6
+ metadata.gz: f8625606b2a2317649091cd778c8441688f0a235b6f30665831f54cbb31c751aef6bdf74b30203e0f2f5e654279f9e017af5b9cc35496b048b32cb7639f651ee
7
+ data.tar.gz: e37ef007f4afcaeac5012ebacd09b97cf0a86416fd10536f380fa6d322cbb14045c7c28f4f49c41ddead7726a97b10b300966bb3022105d52ddee991b70692cb
data/app/controllers/helpdesk/faqs_controller.rb CHANGED
@@ -2,7 +2,7 @@ module Helpdesk
2
2
  class FaqsController < Helpdesk::ApplicationController
3
3
 
4
4
  def search
5
- @faqs = Helpdesk::Faq.search(params[:search])
5
+ @faqs = Helpdesk::Faq.search(params[:search],params[:page])
6
6
  end
7
7
 
8
8
  def index
data/app/models/helpdesk/faq.rb CHANGED
@@ -23,7 +23,7 @@ module Helpdesk
23
23
  arel_faqs_t = Arel::Table.new(:helpdesk_faq_translations)
24
24
  name_match = arel_faqs_t[:title].matches(query)
25
25
  postal_match = arel_faqs_t[:text].matches(query)
26
- with_translations.active.where(name_match.or(postal_match)).page(page).per_page(5)
26
+ with_translations.active.where(name_match.or(postal_match)).page(page)
27
27
  end
28
28
 
29
29
  def anchor
data/app/views/helpdesk/faqs/search.html.haml CHANGED
@@ -7,7 +7,7 @@
7
7
  %div.pageContainer
8
8
  - if params[:search]
9
9
  .alert.alert-info
10
- = t('helpdesk.faqs.search_count', count: @faqs.size, query:params[:search])
10
+ = t('helpdesk.faqs.search_count', count: @faqs.total_count, query:params[:search])
11
11
 
12
12
  %h1
13
13
  = t('helpdesk.faqs.title_s')
@@ -25,3 +25,4 @@
25
25
 
26
26
  = highlight("..."+faq.text[start_index,params[:search].length+40].strip+"...", params[:search], highlighter: '<strong>\1</strong>')
27
27
 
28
+ =paginate @faqs
data/lib/helpdesk/version.rb CHANGED
@@ -1,3 +1,3 @@
1
1
  module Helpdesk
2
- VERSION = "0.0.31"
2
+ VERSION = "0.0.32"
3
3
  end
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: helpdesk
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.0.31
4
+ version: 0.0.32
5
5
  platform: ruby
6
6
  authors:
7
7
  - John Beynon Wacław Łuczak
8
8
  autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2014-11-06 00:00:00.000000000 Z
11
+ date: 2014-11-07 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: launchy