From e78fc82bea156e6d8c5abe9e4a2fb8be028c8488 Mon Sep 17 00:00:00 2001 From: Diaspora Europe Date: Wed, 14 Mar 2012 16:31:54 +0100 Subject: [PATCH] we need json for the notification dropdown #2998 --- app/controllers/notifications_controller.rb | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/app/controllers/notifications_controller.rb b/app/controllers/notifications_controller.rb index efbbd09e6..7e0af8645 100644 --- a/app/controllers/notifications_controller.rb +++ b/app/controllers/notifications_controller.rb @@ -36,10 +36,8 @@ class NotificationsController < ApplicationController pager.replace(result) end - if request.format != :json - @notifications.each do |n| - n[:note_html] = render_to_string( :partial => 'notify_popup_item', :locals => { :n => n } ) - end + @notifications.each do |n| + n[:note_html] = render_to_string( :partial => 'notify_popup_item', :locals => { :n => n } ) end @group_days = @notifications.group_by{|note| I18n.l(note.created_at, :format => I18n.t('date.formats.fullmonth_day')) }