From 20ca2e2e93ff15970e8af038cf635c70b1a41c87 Mon Sep 17 00:00:00 2001
From: maxwell <maxwell@joindiaspora.com>
Date: Thu, 16 Dec 2010 11:16:09 -0800
Subject: [PATCH] make Notification.for return a query, not evaluate.. also
limit notifications pulled back to 25
---
app/controllers/application_controller.rb | 2 +-
app/models/notification.rb | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb
index 6c63858ce0..9cbf813e78 100644
--- a/app/controllers/application_controller.rb
+++ b/app/controllers/application_controller.rb
@@ -17,7 +17,7 @@ class ApplicationController < ActionController::Base
@aspect = nil
@aspects = current_user.aspects.fields(:name)
@aspects_dropdown_array = @aspects.collect{|x| [x.to_s, x.id]}
- @notifications = Notification.for(current_user)
+ @notifications = Notification.for(current_user).limit(25).all
end
end
diff --git a/app/models/notification.rb b/app/models/notification.rb
index 7a9684a886..439b1fe802 100644
--- a/app/models/notification.rb
+++ b/app/models/notification.rb
@@ -17,6 +17,6 @@ class Notification
attr_accessible :object_id, :kind, :user_id, :person_id
def self.for(user, opts={})
- self.all(opts.merge(:user_id => user.id))
+ self.where(opts.merge(:user_id => user.id))
end
end
--
GitLab