Download as
Browse Code »

Commit df1e0ebeac6332e02c35a2bfc32ef0c161a1b864

Authored by Victor Costa
2 parents b05488a8 733087eb
Exists in theme-brasil-digital-from-staging and in 9 other branches angular_poc, api-article-archived, backup-7-jan-2016, captcha_serpro_plugin, login-captcha, production, resend_confirmation_email, staging, staging_rails3

Merge branch 'rails3' into rails3_stable

Showing 3 changed files with 5 additions and 2 deletions   Show diff stats
.ackrc 0 → 100644
  Diff comments   View file @df1e0eb
... ... @@ -0,0 +1,3 @@
  1 +--ignore-dir=log
  2 +--ignore-dir=tmp
  3 +--ignore-dir=pkg
... ...
app/controllers/public/profile_controller.rb
  Diff comments   View file @df1e0eb
... ... @@ -51,7 +51,7 @@ class ProfileController < PublicController
51 51  
52 52 def communities
53 53 if is_cache_expired?(profile.communities_cache_key(params))
54   - @communities = profile.communities.includes(relations_to_include).paginate(:per_page => per_page, :page => params[:npage])
  54 + @communities = profile.communities.includes(relations_to_include).paginate(:per_page => per_page, :page => params[:npage], :total_entries => profile.communities.count)
55 55 end
56 56 end
57 57  
... ...
db/schema.rb
  Diff comments   View file @df1e0eb
... ... @@ -11,7 +11,7 @@
11 11 #
12 12 # It's strongly recommended to check this file into your version control system.
13 13  
14   -ActiveRecord::Schema.define(:version => 20140605222753) do
  14 +ActiveRecord::Schema.define(:version => 20140724134601) do
15 15  
16 16 create_table "abuse_reports", :force => true do |t|
17 17 t.integer "reporter_id"
... ...