From 683bb0dbef3ff9491484995c1a88fad5f25f5d7e Mon Sep 17 00:00:00 2001
From: Raphael <raphael@joindiaspora.com>
Date: Wed, 11 Aug 2010 10:52:01 -0700
Subject: [PATCH] Took out create redirects on ajaxy things, authenticating
statusmessages
---
app/controllers/blogs_controller.rb | 1 -
app/controllers/bookmarks_controller.rb | 1 -
app/controllers/photos_controller.rb | 1 -
app/controllers/status_messages_controller.rb | 3 +--
lib/diaspora/webhooks.rb | 5 +++--
5 files changed, 4 insertions(+), 7 deletions(-)
diff --git a/app/controllers/blogs_controller.rb b/app/controllers/blogs_controller.rb
index a74b12e433..4075e04edf 100644
--- a/app/controllers/blogs_controller.rb
+++ b/app/controllers/blogs_controller.rb
@@ -24,7 +24,6 @@ class BlogsController < ApplicationController
if @blog.created_at
flash[:notice] = "Successfully created blog."
- redirect_to @blog
else
render :action => 'new'
end
diff --git a/app/controllers/bookmarks_controller.rb b/app/controllers/bookmarks_controller.rb
index 79bf76d12e..760a3255c2 100644
--- a/app/controllers/bookmarks_controller.rb
+++ b/app/controllers/bookmarks_controller.rb
@@ -34,7 +34,6 @@ class BookmarksController < ApplicationController
if @bookmark.created_at
flash[:notice] = "Successfully created bookmark."
- redirect_to @bookmark
else
render :action => 'new'
end
diff --git a/app/controllers/photos_controller.rb b/app/controllers/photos_controller.rb
index 9956902133..2996a23ecd 100644
--- a/app/controllers/photos_controller.rb
+++ b/app/controllers/photos_controller.rb
@@ -7,7 +7,6 @@ class PhotosController < ApplicationController
if @photo.created_at
flash[:notice] = "Successfully uploaded photo."
- redirect_to @photo.album
else
render :action => 'album#new'
end
diff --git a/app/controllers/status_messages_controller.rb b/app/controllers/status_messages_controller.rb
index f499492e83..8cc73bac1c 100644
--- a/app/controllers/status_messages_controller.rb
+++ b/app/controllers/status_messages_controller.rb
@@ -1,5 +1,5 @@
class StatusMessagesController < ApplicationController
- #before_filter :authenticate_user!
+ before_filter :authenticate_user!
def index
@status_messages = StatusMessage.paginate :page => params[:page], :order => 'created_at DESC'
@@ -16,7 +16,6 @@ class StatusMessagesController < ApplicationController
if @status_message.created_at
flash[:notice] = "Successfully created status message."
- redirect_to status_messages_url
else
render :action => 'new'
end
diff --git a/lib/diaspora/webhooks.rb b/lib/diaspora/webhooks.rb
index ba78ed81a0..959010e61a 100644
--- a/lib/diaspora/webhooks.rb
+++ b/lib/diaspora/webhooks.rb
@@ -40,10 +40,11 @@ module Diaspora
def people_with_permissions
begin
- friends = self.person.owner.friends
+ friends = self.person.owner.friends.all
+ Rails.logger.error("Dan is wrong!") if friends.nil?
friends ||= []
rescue
- Rails.logger.fatal("IOUASDVJOISDNVPOIJSDVOUIDSGPUOID")
+ Rails.logger.fatal("Called people_with_permissions on a post from a remote user. We need to implement this shit.")
[]
end
end
--
GitLab