it-logica-application-backbone 1.0.15 → 1.0.16

Sign up to get free protection for your applications and to get access to all the features.
data/VERSION CHANGED
@@ -1 +1 @@
1
- 1.0.15
1
+ 1.0.16
@@ -10,4 +10,5 @@
10
10
  <span class="pager_numberofrecords">
11
11
  <%= page_entries_info settings[:data_paginate] %>
12
12
  </span>
13
- </div>
13
+ </div>
14
+
@@ -1,3 +1,8 @@
1
+ <% unless settings[:per_page].blank? %>
2
+ <span class="select_for_per_page" style="float: right">Zobrazit na stránku: <%= select_tag("per_page_chosen", options_for_select(settings[:per_page], settings[:params]['per_page'].to_i),
3
+ :onchange => "form_submit_watcher('#{settings[:form_id]}')",
4
+ :class => "") %></span>
5
+ <% end %>
1
6
  <table class="table table-bordered table-condensed table_special">
2
7
  <thead>
3
8
  <tr>
@@ -5,11 +5,11 @@
5
5
 
6
6
  Gem::Specification.new do |s|
7
7
  s.name = "it-logica-application-backbone"
8
- s.version = "1.0.15"
8
+ s.version = "1.0.16"
9
9
 
10
10
  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
11
11
  s.authors = ["Ladas"]
12
- s.date = "2012-08-30"
12
+ s.date = "2012-08-31"
13
13
  s.description = "longer description of your gem"
14
14
  s.email = "ladislav.smola@it-logica.cz"
15
15
  s.extra_rdoc_files = [
@@ -6,8 +6,13 @@ module ModelMixins
6
6
 
7
7
  params[:order_by] = settings[:default][:order] if params[:order_by].blank? && !settings[:default][:order].blank?
8
8
 
9
- # todo pokud budu predavat per page, mel bz byt i parametr s povolenymi hodnotami per page
10
- params[:per_page] = params["per_page"] unless params["per_page"].blank?
9
+ # there are allowed per_pages in the settings[:per_page]
10
+ unless settings[:per_page].blank?
11
+ unless params["per_page_chosen"].blank?
12
+ params[:per_page] = settings[:per_page].include?(params["per_page_chosen"].to_i) ? params["per_page_chosen"].to_i : settings[:per_page].first
13
+ end
14
+ end
15
+
11
16
 
12
17
  params[:per_page] = settings[:default][:per_page] if params[:per_page].blank? && !settings[:default][:per_page].blank?
13
18
  params[:per_page] = per_page if params[:per_page].blank?
metadata CHANGED
@@ -1,7 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: it-logica-application-backbone
3
3
  version: !ruby/object:Gem::Version
4
- version: 1.0.15
4
+ version: 1.0.16
5
5
  prerelease:
6
6
  platform: ruby
7
7
  authors:
@@ -9,11 +9,11 @@ authors:
9
9
  autorequire:
10
10
  bindir: bin
11
11
  cert_chain: []
12
- date: 2012-08-30 00:00:00.000000000 Z
12
+ date: 2012-08-31 00:00:00.000000000 Z
13
13
  dependencies:
14
14
  - !ruby/object:Gem::Dependency
15
15
  name: htmlentities
16
- requirement: &84148440 !ruby/object:Gem::Requirement
16
+ requirement: &79460090 !ruby/object:Gem::Requirement
17
17
  none: false
18
18
  requirements:
19
19
  - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
21
21
  version: '0'
22
22
  type: :runtime
23
23
  prerelease: false
24
- version_requirements: *84148440
24
+ version_requirements: *79460090
25
25
  - !ruby/object:Gem::Dependency
26
26
  name: shoulda
27
- requirement: &84148180 !ruby/object:Gem::Requirement
27
+ requirement: &79459820 !ruby/object:Gem::Requirement
28
28
  none: false
29
29
  requirements:
30
30
  - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
32
32
  version: '0'
33
33
  type: :development
34
34
  prerelease: false
35
- version_requirements: *84148180
35
+ version_requirements: *79459820
36
36
  - !ruby/object:Gem::Dependency
37
37
  name: rdoc
38
- requirement: &84147870 !ruby/object:Gem::Requirement
38
+ requirement: &79459530 !ruby/object:Gem::Requirement
39
39
  none: false
40
40
  requirements:
41
41
  - - ~>
@@ -43,10 +43,10 @@ dependencies:
43
43
  version: '3.12'
44
44
  type: :development
45
45
  prerelease: false
46
- version_requirements: *84147870
46
+ version_requirements: *79459530
47
47
  - !ruby/object:Gem::Dependency
48
48
  name: bundler
49
- requirement: &84147570 !ruby/object:Gem::Requirement
49
+ requirement: &79459260 !ruby/object:Gem::Requirement
50
50
  none: false
51
51
  requirements:
52
52
  - - ~>
@@ -54,10 +54,10 @@ dependencies:
54
54
  version: 1.1.0
55
55
  type: :development
56
56
  prerelease: false
57
- version_requirements: *84147570
57
+ version_requirements: *79459260
58
58
  - !ruby/object:Gem::Dependency
59
59
  name: jeweler
60
- requirement: &84147250 !ruby/object:Gem::Requirement
60
+ requirement: &79458940 !ruby/object:Gem::Requirement
61
61
  none: false
62
62
  requirements:
63
63
  - - ~>
@@ -65,10 +65,10 @@ dependencies:
65
65
  version: 1.8.4
66
66
  type: :development
67
67
  prerelease: false
68
- version_requirements: *84147250
68
+ version_requirements: *79458940
69
69
  - !ruby/object:Gem::Dependency
70
70
  name: simplecov
71
- requirement: &84146960 !ruby/object:Gem::Requirement
71
+ requirement: &79458600 !ruby/object:Gem::Requirement
72
72
  none: false
73
73
  requirements:
74
74
  - - ! '>='
@@ -76,7 +76,7 @@ dependencies:
76
76
  version: '0'
77
77
  type: :development
78
78
  prerelease: false
79
- version_requirements: *84146960
79
+ version_requirements: *79458600
80
80
  description: longer description of your gem
81
81
  email: ladislav.smola@it-logica.cz
82
82
  executables: []
@@ -574,7 +574,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
574
574
  version: '0'
575
575
  segments:
576
576
  - 0
577
- hash: -449014353
577
+ hash: -5997487
578
578
  required_rubygems_version: !ruby/object:Gem::Requirement
579
579
  none: false
580
580
  requirements: