brightcontent-core 2.0.27 → 2.0.28

Sign up to get free protection for your applications and to get access to all the features.
data/Gemfile.lock CHANGED
@@ -1,7 +1,7 @@
1
1
  PATH
2
2
  remote: .
3
3
  specs:
4
- brightcontent-core (2.0.27)
4
+ brightcontent-core (2.0.28)
5
5
  bcrypt-ruby
6
6
  bootstrap-wysihtml5-rails
7
7
  has_scope
@@ -31,6 +31,7 @@
31
31
  <li class="dropdown">
32
32
  <a href="#" class="dropdown-toggle" data-toggle="dropdown"><%= current_user.email %><b class="caret"></b></a>
33
33
  <ul class="dropdown-menu">
34
+ <li><%= link_to "Homepage", "/" %></li>
34
35
  <li><%= link_to "Admins", admin_users_path %></li>
35
36
  <li><%= link_to "Logout", logout_path %></li>
36
37
  <ul>
@@ -17,7 +17,7 @@ module Brightcontent
17
17
  private
18
18
 
19
19
  def end_of_association_chain
20
- if action_name == "index"
20
+ if action_name == "index" && self.class.per_page_count > 0
21
21
  super.paginate(page: params[:page], per_page: self.class.per_page_count)
22
22
  else
23
23
  super
metadata CHANGED
@@ -1,7 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: brightcontent-core
3
3
  version: !ruby/object:Gem::Version
4
- version: 2.0.27
4
+ version: 2.0.28
5
5
  prerelease:
6
6
  platform: ruby
7
7
  authors:
@@ -9,7 +9,7 @@ authors:
9
9
  autorequire:
10
10
  bindir: bin
11
11
  cert_chain: []
12
- date: 2013-03-26 00:00:00.000000000 Z
12
+ date: 2013-03-27 00:00:00.000000000 Z
13
13
  dependencies:
14
14
  - !ruby/object:Gem::Dependency
15
15
  name: rails
@@ -365,7 +365,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
365
365
  version: '0'
366
366
  segments:
367
367
  - 0
368
- hash: -10380041839899928
368
+ hash: 651355249441561300
369
369
  required_rubygems_version: !ruby/object:Gem::Requirement
370
370
  none: false
371
371
  requirements:
@@ -374,7 +374,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
374
374
  version: '0'
375
375
  segments:
376
376
  - 0
377
- hash: -10380041839899928
377
+ hash: 651355249441561300
378
378
  requirements: []
379
379
  rubyforge_project:
380
380
  rubygems_version: 1.8.24