diff options
| author | jessib <jessib@riseup.net> | 2013-09-02 09:59:49 -0700 |
|---|---|---|
| committer | jessib <jessib@riseup.net> | 2013-09-02 09:59:49 -0700 |
| commit | 6110093e939db07fd27fac7c28ddcd09a49e70ed (patch) | |
| tree | 4393c3e8fcb2969b0bd21800bff7dd5a1fc9c3d7 /billing/app/controllers/billing_base_controller.rb | |
| parent | 060e06daa065f02b811dfe12850b101a62c12c8d (diff) | |
| parent | 77af7ac953fb22c181056e8c40c8749d12a63922 (diff) | |
Merge pull request #74 from azul/refactor/finding-users
there's no need for User#find_by_param. clean it up
Diffstat (limited to 'billing/app/controllers/billing_base_controller.rb')
| -rw-r--r-- | billing/app/controllers/billing_base_controller.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/billing/app/controllers/billing_base_controller.rb b/billing/app/controllers/billing_base_controller.rb index 06820a6..c250831 100644 --- a/billing/app/controllers/billing_base_controller.rb +++ b/billing/app/controllers/billing_base_controller.rb @@ -6,12 +6,12 @@ class BillingBaseController < ApplicationController # required for navigation to work. def assign_user if params[:user_id] - @user = User.find_by_param(params[:user_id]) + @user = User.find(params[:user_id]) elsif params[:action] == "confirm" or params[:action] == "destroy" # confirms and subscription deletes will come back with different ID set, so check for this first # This is only for cases where an admin cannot apply action for customer, but should be all confirms @user = current_user elsif params[:id] - @user = User.find_by_param(params[:id]) + @user = User.find(params[:id]) else # TODO # hacky, what are cases where @user hasn't yet been set? certainly some cases with subscriptions and payments |