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

uhm, --amend

Browse source
This commit is contained in:
MrZYX 2011-03-10 15:31:24 +01:00
parent 7bf256ecfa
commit 58796dcde2
1 changed files with 8 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
app/controllers/application_controller.rb
View file

@ -23,7 +23,8 @@ class ApplicationController < ActionController::Base
end end
def set_header_data def set_header_data
if user_signed_in? && request.format.html? if user_signed_in?
if request.format.html?
@aspect = nil @aspect = nil
@object_aspect_ids = [] @object_aspect_ids = []
@notification_count = Notification.for(current_user, :unread =>true).count @notification_count = Notification.for(current_user, :unread =>true).count
@ -31,6 +32,7 @@ class ApplicationController < ActionController::Base
end end
@all_aspects = current_user.aspects @all_aspects = current_user.aspects
end end
end
def count_requests def count_requests
@request_count = Request.where(:recipient_id => current_user.person.id).count if current_user @request_count = Request.where(:recipient_id => current_user.person.id).count if current_user