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

14
app/controllers/application_controller.rb
View file

@ -23,13 +23,15 @@ 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?
@aspect = nil if request.format.html?
@object_aspect_ids = [] @aspect = nil
@notification_count = Notification.for(current_user, :unread =>true).count @object_aspect_ids = []
@unread_message_count = ConversationVisibility.sum(:unread, :conditions => "person_id = #{current_user.person.id}") @notification_count = Notification.for(current_user, :unread =>true).count
@unread_message_count = ConversationVisibility.sum(:unread, :conditions => "person_id = #{current_user.person.id}")
end
@all_aspects = current_user.aspects
end end
@all_aspects = current_user.aspects
end end
def count_requests def count_requests