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

was breaking the API (tests are coming)

This commit is contained in:
Didier Lafforgue 2012-04-17 13:53:15 +02:00
parent 39bb85d163
commit 67c36191d2
1 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
lib/locomotive/action_controller/responder.rb
View File

@ -10,10 +10,14 @@ module Locomotive
end
def options
current_site = self.controller.send(:current_site)
current_account = self.controller.send(:current_locomotive_account)
ability = current_account.nil? ? nil : self.controller.send(:current_ability)
super.merge({
:current_site => self.controller.send(:current_site),
:current_account => self.controller.send(:current_locomotive_account),
:ability => self.controller.send(:current_ability)
:current_site => current_site,
:current_account => current_account,
:ability => ability
})
end