From 1f11e51a9bdc3a528f8538049aaff509cfa3ea18 Mon Sep 17 00:00:00 2001
From: Maxwell Salzberg <maxwell@joindiaspora.com>
Date: Thu, 16 Jun 2011 15:59:03 -0700
Subject: [PATCH] add object_aspect_ids to status_message controller
---
app/controllers/photos_controller.rb | 2 +-
app/controllers/status_messages_controller.rb | 10 ++++++++++
2 files changed, 11 insertions(+), 1 deletion(-)
diff --git a/app/controllers/photos_controller.rb b/app/controllers/photos_controller.rb
index 2807b75aa6..a0dd7f1a0e 100644
--- a/app/controllers/photos_controller.rb
+++ b/app/controllers/photos_controller.rb
@@ -185,7 +185,7 @@ class PhotosController < ApplicationController
# used on the show page to show which aspects are selected
def object_aspect_ids
if params[:action] == 'show' && parent_aspects = parent.aspects.where(:user_id => current_user.id).all
- @object_aspect_ids ||= parent_aspects.map!{|a| a.id}
+ @object_aspect_ids ||= parent_aspects.map{|a| a.id}
else
super
end
diff --git a/app/controllers/status_messages_controller.rb b/app/controllers/status_messages_controller.rb
index 4985a7f525..d1549884d6 100644
--- a/app/controllers/status_messages_controller.rb
+++ b/app/controllers/status_messages_controller.rb
@@ -9,6 +9,9 @@ class StatusMessagesController < ApplicationController
respond_to :mobile
respond_to :json, :only => :show
+
+ helper_method :object_aspect_ids
+
def new
@person = Person.find(params[:person_id])
@aspect = :profile
@@ -121,4 +124,11 @@ class StatusMessagesController < ApplicationController
end
end
+ def object_aspect_ids
+ if params[:action] == 'show'
+ @object_aspect_ids ||= @status_message.aspects.map{|a| a.id}
+ else
+ super
+ end
+ end
end
--
GitLab