From 15e0f887583a76796485375aca1cd0c713ad21ae Mon Sep 17 00:00:00 2001
From: cmrd Senya <senya@riseup.net>
Date: Mon, 8 Aug 2016 13:38:37 +0300
Subject: [PATCH] Rename photos[:count] to photos_count in gon

---
 app/assets/javascripts/app/pages/profile.js             | 4 ++--
 app/assets/javascripts/app/views/profile_header_view.js | 2 +-
 app/assets/templates/profile_header_tpl.jst.hbs         | 2 +-
 app/controllers/people_controller.rb                    | 8 ++------
 app/controllers/photos_controller.rb                    | 4 +---
 spec/controllers/people_controller_spec.rb              | 8 ++++----
 spec/controllers/photos_controller_spec.rb              | 8 ++++----
 7 files changed, 15 insertions(+), 21 deletions(-)

diff --git a/app/assets/javascripts/app/pages/profile.js b/app/assets/javascripts/app/pages/profile.js
index f42f1e31e..f5eff7d79 100644
--- a/app/assets/javascripts/app/pages/profile.js
+++ b/app/assets/javascripts/app/pages/profile.js
@@ -21,8 +21,8 @@ app.pages.Profile = app.views.Base.extend({
       this._populateModel(opts);
     }
 
-    if(app.hasPreload("photos")){
-      this.photos = app.parsePreload("photos");
+    if (app.hasPreload("photos_count")) {
+      this.photos = app.parsePreload("photos_count");
     }
     if (app.hasPreload("contacts_count")) {
       this.contacts = app.parsePreload("contacts_count");
diff --git a/app/assets/javascripts/app/views/profile_header_view.js b/app/assets/javascripts/app/views/profile_header_view.js
index 5d49b2f0f..37595d580 100644
--- a/app/assets/javascripts/app/views/profile_header_view.js
+++ b/app/assets/javascripts/app/views/profile_header_view.js
@@ -38,7 +38,7 @@ app.views.ProfileHeader = app.views.Base.extend({
   },
 
   _shouldShowPhotos: function() {
-    return (this.photos && this.photos.count > 0);
+    return (this.photos && this.photos > 0);
   },
 
   _shouldShowContacts: function() {
diff --git a/app/assets/templates/profile_header_tpl.jst.hbs b/app/assets/templates/profile_header_tpl.jst.hbs
index 22bc5b7e0..4885810e5 100644
--- a/app/assets/templates/profile_header_tpl.jst.hbs
+++ b/app/assets/templates/profile_header_tpl.jst.hbs
@@ -78,7 +78,7 @@
         <a href="{{urlTo 'personPhotos' guid}}" id="photos_link">
           <i class="entypo-picture"></i>
           {{t 'profile.photos'}}
-          <div class="badge badge-default">{{photos.count}}</div>
+          <div class="badge badge-default">{{photos}}</div>
         </a>
       </li>
     {{/if}}
diff --git a/app/controllers/people_controller.rb b/app/controllers/people_controller.rb
index 21340b5ae..b8f396a9f 100644
--- a/app/controllers/people_controller.rb
+++ b/app/controllers/people_controller.rb
@@ -75,9 +75,7 @@ class PeopleController < ApplicationController
           @contact = current_user.contact_for(@person)
         end
         gon.preloads[:person] = @person_json
-        gon.preloads[:photos] = {
-          count: Photo.visible(current_user, @person).count(:all)
-        }
+        gon.preloads[:photos_count] = Photo.visible(current_user, @person).count(:all)
         gon.preloads[:contacts_count] = Contact.contact_contacts_for(current_user, @person).count(:all)
         respond_with @person, layout: "with_header"
       end
@@ -135,9 +133,7 @@ class PeopleController < ApplicationController
           @contact = current_user.contact_for(@person)
           @contacts_of_contact = Contact.contact_contacts_for(current_user, @person)
           gon.preloads[:person] = PersonPresenter.new(@person, current_user).as_json
-          gon.preloads[:photos] = {
-            count: Photo.visible(current_user, @person).count(:all)
-          }
+          gon.preloads[:photos_count] = Photo.visible(current_user, @person).count(:all)
           gon.preloads[:contacts_count] = @contacts_of_contact.count(:all)
           @contacts_of_contact = @contacts_of_contact.paginate(page: params[:page], per_page: (params[:limit] || 15))
           @hashes = hashes_for_people @contacts_of_contact, @aspects
diff --git a/app/controllers/photos_controller.rb b/app/controllers/photos_controller.rb
index 72a200945..a14304fd4 100644
--- a/app/controllers/photos_controller.rb
+++ b/app/controllers/photos_controller.rb
@@ -27,9 +27,7 @@ class PhotosController < ApplicationController
       respond_to do |format|
         format.all do
           gon.preloads[:person] = PersonPresenter.new(@person, current_user).as_json
-          gon.preloads[:photos] = {
-            count: Photo.visible(current_user, @person).count(:all)
-          }
+          gon.preloads[:photos_count] = Photo.visible(current_user, @person).count(:all)
           gon.preloads[:contacts_count] = Contact.contact_contacts_for(current_user, @person).count(:all)
           render "people/show", layout: "with_header"
         end
diff --git a/spec/controllers/people_controller_spec.rb b/spec/controllers/people_controller_spec.rb
index 948a3fcf8..056bc1591 100644
--- a/spec/controllers/people_controller_spec.rb
+++ b/spec/controllers/people_controller_spec.rb
@@ -195,11 +195,11 @@ describe PeopleController, :type => :controller do
         eve.post(:photo, :user_file => uploaded_photo, :to => eve.aspects.first.id, :public => true)
       end
       get :show, :id => eve.person.to_param
-      expect(response.body).to include '"photos":{"count":16}'
+      expect(response.body).to include ',"photos_count":16'
 
       eve.post(:photo, :user_file => uploaded_photo, :to => eve.aspects.first.id, :public => false)
       get :show, :id => eve.person.to_param
-      expect(response.body).to include '"photos":{"count":16}' # eve is not sharing with alice
+      expect(response.body).to include ',"photos_count":16' # eve is not sharing with alice
     end
 
     context "when the person is the current user" do
@@ -491,11 +491,11 @@ describe PeopleController, :type => :controller do
         eve.post(:photo, :user_file => uploaded_photo, :to => eve.aspects.first.id, :public => true)
       end
       get :contacts, :person_id => eve.person.to_param
-      expect(response.body).to include '"photos":{"count":16}'
+      expect(response.body).to include ',"photos_count":16'
 
       eve.post(:photo, :user_file => uploaded_photo, :to => eve.aspects.first.id, :public => false)
       get :contacts, :person_id => eve.person.to_param
-      expect(response.body).to include '"photos":{"count":16}' # eve is not sharing with alice
+      expect(response.body).to include ',"photos_count":16' # eve is not sharing with alice
     end
 
     it "returns a 406 for json format" do
diff --git a/spec/controllers/photos_controller_spec.rb b/spec/controllers/photos_controller_spec.rb
index d6bd32843..26ad7e13a 100644
--- a/spec/controllers/photos_controller_spec.rb
+++ b/spec/controllers/photos_controller_spec.rb
@@ -109,11 +109,11 @@ describe PhotosController, :type => :controller do
         eve.post(:photo, :user_file => uploaded_photo, :to => eve.aspects.first.id, :public => true)
       end
       get :index, :person_id => eve.person.to_param
-      expect(response.body).to include '"photos":{"count":16}'
+      expect(response.body).to include ',"photos_count":16'
 
       eve.post(:photo, :user_file => uploaded_photo, :to => eve.aspects.first.id, :public => false)
       get :index, :person_id => eve.person.to_param
-      expect(response.body).to include '"photos":{"count":16}' # eve is not sharing with alice
+      expect(response.body).to include ',"photos_count":16' # eve is not sharing with alice
     end
 
     it "returns json when requested" do
@@ -160,11 +160,11 @@ describe PhotosController, :type => :controller do
           eve.post(:photo, user_file: uploaded_photo, to: eve.aspects.first.id, public: true)
         end
         get :index, person_id: eve.person.to_param
-        expect(response.body).to include '"photos":{"count":16}'
+        expect(response.body).to include ',"photos_count":16'
 
         eve.post(:photo, user_file: uploaded_photo, to: eve.aspects.first.id, public: false)
         get :index, person_id: eve.person.to_param
-        expect(response.body).to include '"photos":{"count":16}'
+        expect(response.body).to include ',"photos_count":16'
       end
 
       it "displays a person's pictures" do