From fe915ecb098a96b984741a3519386dbfffc68b26 Mon Sep 17 00:00:00 2001
From: danielgrippi <danielgrippi@gmail.com>
Date: Sat, 10 Sep 2011 09:24:54 -0700
Subject: [PATCH] don't redirect to AspectsController#new from
AspectsController#index if no aspect is present
---
app/controllers/aspects_controller.rb | 6 ------
app/views/aspects/_selected_contacts.html.haml | 3 ++-
spec/controllers/aspects_controller_spec.rb | 12 ------------
3 files changed, 2 insertions(+), 19 deletions(-)
diff --git a/app/controllers/aspects_controller.rb b/app/controllers/aspects_controller.rb
index 0b32c5cdd5..def9ea151c 100644
--- a/app/controllers/aspects_controller.rb
+++ b/app/controllers/aspects_controller.rb
@@ -18,12 +18,6 @@ class AspectsController < ApplicationController
@aspects = current_user.aspects
@aspects = @aspects.where(:id => params[:a_ids]) if params[:a_ids]
- # redirect to aspects creation
- if @aspects.blank?
- redirect_to new_aspect_path
- return
- end
-
@aspect_ids = @aspects.map { |a| a.id }
@posts = current_user.visible_posts(:by_members_of => @aspect_ids,
:type => ['StatusMessage','Reshare', 'ActivityStreams::Photo'],
diff --git a/app/views/aspects/_selected_contacts.html.haml b/app/views/aspects/_selected_contacts.html.haml
index 83af077cb4..1d359f3623 100644
--- a/app/views/aspects/_selected_contacts.html.haml
+++ b/app/views/aspects/_selected_contacts.html.haml
@@ -1,12 +1,13 @@
#selected_aspect_contacts.section
.title.no_icon
%h5
- - if all_aspects_selected? || @aspect_ids.size > 1
+ - if all_aspects_selected? || !@aspect || @aspect_ids.size > 1
= "#{t('_contacts')}"
- else
= @aspect.name
= "(#{count})"
+
.content
- if people.size > 0
- for person in people
diff --git a/spec/controllers/aspects_controller_spec.rb b/spec/controllers/aspects_controller_spec.rb
index a833e737a6..2edd48b906 100644
--- a/spec/controllers/aspects_controller_spec.rb
+++ b/spec/controllers/aspects_controller_spec.rb
@@ -152,18 +152,6 @@ describe AspectsController do
end
end
- context 'with no aspects' do
- before do
- alice.aspects.each { |aspect| aspect.destroy }
- alice.reload
- end
-
- it 'redirects to the new aspect page' do
- get :index
- response.should redirect_to new_aspect_path
- end
- end
-
context 'with posts in multiple aspects' do
before do
@posts = []
--
GitLab