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

Merge branch '874-wrong-time-ago-on-notifications' of https://github.com/grzuy/diaspora

Browse source
This commit is contained in:
MrZYX 2011-02-20 13:03:33 +01:00
commit 2b625c468a
2 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/controllers/notifications_controller.rb
View file

@ -19,7 +19,7 @@ class NotificationsController < ApplicationController
def index def index
@notifications = Notification.find(:all, :conditions => {:recipient_id => current_user.id}, @notifications = Notification.find(:all, :conditions => {:recipient_id => current_user.id},
:order => 'updated_at desc', :include => [:target, {:actors => :profile}]).paginate :page => params[:page], :per_page => 25 :order => 'created_at desc', :include => [:target, {:actors => :profile}]).paginate :page => params[:page], :per_page => 25
@group_days = @notifications.group_by{|note| I18n.l(note.updated_at, :format => I18n.t('date.formats.fullmonth_day')) } @group_days = @notifications.group_by{|note| I18n.l(note.updated_at, :format => I18n.t('date.formats.fullmonth_day')) }
respond_with @notifications respond_with @notifications
end end

2
app/views/notifications/index.html.haml
View file

@ -41,5 +41,5 @@
= notification_people_link(note) = notification_people_link(note)
= object_link(note) = object_link(note)
%span.time= timeago(note.updated_at) %span.time= timeago(note.created_at)
= will_paginate @notifications = will_paginate @notifications