diff --git a/app/controllers/notifications_controller.rb b/app/controllers/notifications_controller.rb index bbc760c2f391a49680d1d8d977bb33d458ea8340..fc9e73cf3ec19f7091600b4667c0dbd875218be2 100644 --- a/app/controllers/notifications_controller.rb +++ b/app/controllers/notifications_controller.rb @@ -19,7 +19,7 @@ class NotificationsController < ApplicationController def index @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')) } respond_with @notifications end diff --git a/app/views/notifications/index.html.haml b/app/views/notifications/index.html.haml index 5f2d4a33b1efcfde520690a0287c0ba036882a8b..8412a92b59b5ae70a7e4cdc22a2fd7c40a216556 100644 --- a/app/views/notifications/index.html.haml +++ b/app/views/notifications/index.html.haml @@ -41,5 +41,5 @@ = notification_people_link(note) = object_link(note) - %span.time= timeago(note.updated_at) + %span.time= timeago(note.created_at) = will_paginate @notifications