github-migration/engine
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

use memberships correctly

Browse Source
This commit is contained in:
Enrique García Cota 2012-03-02 23:59:58 +01:00
parent ae18098c6d
commit db171eba22
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
lib/locomotive/liquid/drops/current_user.rb
View File

@ -9,10 +9,10 @@ module Locomotive
_source.present? _source.present?
end end
def name def name
_source.account.name if logged_in? _source.name if logged_in?
end end
def email def email
_source.account.email if logged_in? _source.email if logged_in?
end end
def logout_path def logout_path
destroy_admin_session_path destroy_admin_session_path

2
spec/lib/locomotive/liquid/drops/current_user_spec.rb
View File

@ -14,7 +14,7 @@ describe Locomotive::Liquid::Drops::CurrentUser do
@controller.stubs(:request).returns(OpenStruct.new(:url => '/subpage', :fullpath => '/subpage')) @controller.stubs(:request).returns(OpenStruct.new(:url => '/subpage', :fullpath => '/subpage'))
@controller.current_site = @site @controller.current_site = @site
@admin = FactoryGirl.build(:admin) @admin = FactoryGirl.build(:admin).account
end end
def expect_render(template, text) def expect_render(template, text)