trying another thing to get the redirect working
This commit is contained in:
parent
52908cec1a
commit
a84f9437b0
6 changed files with 25 additions and 5 deletions
|
|
@ -18,7 +18,7 @@ class PeopleController < ApplicationController
|
||||||
|
|
||||||
@person = Person.find(params[:id].to_id)
|
@person = Person.find(params[:id].to_id)
|
||||||
@post_type = :all
|
@post_type = :all
|
||||||
|
@aspect = :none
|
||||||
if @person
|
if @person
|
||||||
@profile = @person.profile
|
@profile = @person.profile
|
||||||
@contact = current_user.contact_for(@person)
|
@contact = current_user.contact_for(@person)
|
||||||
|
|
|
||||||
|
|
@ -11,6 +11,7 @@ class ServicesController < ApplicationController
|
||||||
end
|
end
|
||||||
|
|
||||||
def create
|
def create
|
||||||
|
|
||||||
auth = request.env['omniauth.auth']
|
auth = request.env['omniauth.auth']
|
||||||
|
|
||||||
provider = auth['provider']
|
provider = auth['provider']
|
||||||
|
|
@ -32,7 +33,11 @@ class ServicesController < ApplicationController
|
||||||
end
|
end
|
||||||
|
|
||||||
flash[:notice] = I18n.t 'services.create.success'
|
flash[:notice] = I18n.t 'services.create.success'
|
||||||
redirect_to :back
|
if current_user.getting_started
|
||||||
|
redirect_to getting_started_path(:step => 3)
|
||||||
|
else
|
||||||
|
redirect_to services_url
|
||||||
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
def destroy
|
def destroy
|
||||||
|
|
|
||||||
|
|
@ -24,7 +24,7 @@ class StatusMessagesController < ApplicationController
|
||||||
|
|
||||||
def index
|
def index
|
||||||
@aspect = :profile
|
@aspect = :profile
|
||||||
@post_type = :status_message
|
@post_type = :status_messages
|
||||||
|
|
||||||
@person = Person.find(params[:person_id].to_id)
|
@person = Person.find(params[:person_id].to_id)
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -11,7 +11,7 @@
|
||||||
});
|
});
|
||||||
});
|
});
|
||||||
|
|
||||||
.span-24.last
|
.span-15.last
|
||||||
#thumbnails
|
#thumbnails
|
||||||
- for photo in photos
|
- for photo in photos
|
||||||
.image_thumb
|
.image_thumb
|
||||||
|
|
|
||||||
|
|
@ -16,3 +16,4 @@
|
||||||
= link_to t('.view_profile'), person_path(person)
|
= link_to t('.view_profile'), person_path(person)
|
||||||
= link_to t('_photos'), person_photos_path(person)
|
= link_to t('_photos'), person_photos_path(person)
|
||||||
= link_to 'status messages', person_status_messages_path(person)
|
= link_to 'status messages', person_status_messages_path(person)
|
||||||
|
= "viewing: #{@post_type.to_s.titleize}" if defined?(@post_type)
|
||||||
|
|
|
||||||
|
|
@ -22,6 +22,7 @@ describe ServicesController do
|
||||||
|
|
||||||
before do
|
before do
|
||||||
sign_in :user, user
|
sign_in :user, user
|
||||||
|
@controller.stub!(:current_user).and_return(user)
|
||||||
mock_access_token.stub!(:token).and_return("12345")
|
mock_access_token.stub!(:token).and_return("12345")
|
||||||
mock_access_token.stub!(:secret).and_return("56789")
|
mock_access_token.stub!(:secret).and_return("56789")
|
||||||
end
|
end
|
||||||
|
|
@ -36,9 +37,22 @@ describe ServicesController do
|
||||||
describe '#create' do
|
describe '#create' do
|
||||||
it 'creates a new OmniauthService' do
|
it 'creates a new OmniauthService' do
|
||||||
request.env['omniauth.auth'] = omniauth_auth
|
request.env['omniauth.auth'] = omniauth_auth
|
||||||
request.env["HTTP_REFERER"] = ""
|
|
||||||
lambda{post :create}.should change(user.services, :count).by(1)
|
lambda{post :create}.should change(user.services, :count).by(1)
|
||||||
end
|
end
|
||||||
|
|
||||||
|
it 'should redirect to getting started if the user still getting started' do
|
||||||
|
user.getting_started = true
|
||||||
|
request.env['omniauth.auth'] = omniauth_auth
|
||||||
|
post :create
|
||||||
|
response.should redirect_to getting_started_path(:step => 3)
|
||||||
|
end
|
||||||
|
|
||||||
|
it 'should redirect to services url' do
|
||||||
|
user.getting_started = false
|
||||||
|
request.env['omniauth.auth'] = omniauth_auth
|
||||||
|
post :create
|
||||||
|
response.should redirect_to services_url
|
||||||
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
describe '#destroy' do
|
describe '#destroy' do
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue