nocebo/diaspora
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Rename contacts[:count] to contacts_count in gon

Browse source
This commit is contained in:
cmrd Senya 2016-07-22 23:14:34 +03:00
parent ed7fc10043
commit d8687ccb3a
No known key found for this signature in database
GPG key ID: 5FCC5BA680E67BFE
5 changed files with 8 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
app/assets/javascripts/app/pages/profile.js
View file

@ -24,8 +24,8 @@ app.pages.Profile = app.views.Base.extend({
if(app.hasPreload("photos")){ if(app.hasPreload("photos")){
this.photos = app.parsePreload("photos"); this.photos = app.parsePreload("photos");
} }
if(app.hasPreload("contacts")){ if (app.hasPreload("contacts_count")) {
this.contacts = app.parsePreload("contacts"); this.contacts = app.parsePreload("contacts_count");
} }
this.streamCollection = _.has(opts, "streamCollection") ? opts.streamCollection : null; this.streamCollection = _.has(opts, "streamCollection") ? opts.streamCollection : null;

2
app/assets/javascripts/app/views/profile_header_view.js
View file

@ -42,7 +42,7 @@ app.views.ProfileHeader = app.views.Base.extend({
}, },
_shouldShowContacts: function() { _shouldShowContacts: function() {
return (this.contacts && this.contacts.count > 0); return (this.contacts && this.contacts > 0);
}, },
showMentionModal: function(){ showMentionModal: function(){

4
app/assets/templates/profile_header_tpl.jst.hbs
View file

@ -88,13 +88,13 @@
<a href="{{urlTo 'contacts'}}" id="contacts_link"> <a href="{{urlTo 'contacts'}}" id="contacts_link">
<i class="entypo-users"></i> <i class="entypo-users"></i>
{{t 'profile.contacts'}} {{t 'profile.contacts'}}
<div class="badge badge-default">{{contacts.count}}</div> <div class="badge badge-default">{{contacts}}</div>
</a> </a>
{{else}} {{else}}
<a href="{{urlTo 'personContacts' guid}}" id="contacts_link"> <a href="{{urlTo 'personContacts' guid}}" id="contacts_link">
<i class="entypo-users"></i> <i class="entypo-users"></i>
{{t 'profile.contacts'}} {{t 'profile.contacts'}}
<div class="badge badge-default">{{contacts.count}}</div> <div class="badge badge-default">{{contacts}}</div>
</a> </a>
{{/if}} {{/if}}
</li> </li>

8
app/controllers/people_controller.rb
View file

@ -78,9 +78,7 @@ class PeopleController < ApplicationController
gon.preloads[:photos] = { gon.preloads[:photos] = {
count: Photo.visible(current_user, @person).count(:all) count: Photo.visible(current_user, @person).count(:all)
} }
gon.preloads[:contacts] = { gon.preloads[:contacts_count] = Contact.contact_contacts_for(current_user, @person).count(:all)
count: Contact.contact_contacts_for(current_user, @person).count(:all),
}
respond_with @person, layout: "with_header" respond_with @person, layout: "with_header"
end end
@ -140,9 +138,7 @@ class PeopleController < ApplicationController
gon.preloads[:photos] = { gon.preloads[:photos] = {
count: Photo.visible(current_user, @person).count(:all) count: Photo.visible(current_user, @person).count(:all)
} }
gon.preloads[:contacts] = { gon.preloads[:contacts_count] = @contacts_of_contact.count(:all)
count: @contacts_of_contact.count(:all),
}
@contacts_of_contact = @contacts_of_contact.paginate(page: params[:page], per_page: (params[:limit] || 15)) @contacts_of_contact = @contacts_of_contact.paginate(page: params[:page], per_page: (params[:limit] || 15))
@hashes = hashes_for_people @contacts_of_contact, @aspects @hashes = hashes_for_people @contacts_of_contact, @aspects
respond_with @person, layout: "with_header" respond_with @person, layout: "with_header"

4
app/controllers/photos_controller.rb
View file

@ -30,9 +30,7 @@ class PhotosController < ApplicationController
gon.preloads[:photos] = { gon.preloads[:photos] = {
count: Photo.visible(current_user, @person).count(:all) count: Photo.visible(current_user, @person).count(:all)
} }
gon.preloads[:contacts] = { gon.preloads[:contacts_count] = Contact.contact_contacts_for(current_user, @person).count(:all)
count: Contact.contact_contacts_for(current_user, @person).count(:all),
}
render "people/show", layout: "with_header" render "people/show", layout: "with_header"
end end
format.mobile { render "people/show" } format.mobile { render "people/show" }