diff options
| author | jessib <jessib@riseup.net> | 2013-09-19 12:07:25 -0700 |
|---|---|---|
| committer | jessib <jessib@riseup.net> | 2013-09-19 12:07:25 -0700 |
| commit | 3a2e64c75f67af89ffd78dbf80dd947896d85d22 (patch) | |
| tree | ea17ee32d763bb875e4814b09ed1f443c112980c /billing/app/controllers/billing_base_controller.rb | |
| parent | e8a2db42813dc3f5d1ebb95eb896455d7a922505 (diff) | |
| parent | 890c9e170fc038eccb46eca3c1ddcf6f05eaa53f (diff) | |
Merge branch 'develop' into feature/only_lower_case_aliases
Diffstat (limited to 'billing/app/controllers/billing_base_controller.rb')
| -rw-r--r-- | billing/app/controllers/billing_base_controller.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/billing/app/controllers/billing_base_controller.rb b/billing/app/controllers/billing_base_controller.rb index c250831..0453677 100644 --- a/billing/app/controllers/billing_base_controller.rb +++ b/billing/app/controllers/billing_base_controller.rb @@ -7,7 +7,7 @@ class BillingBaseController < ApplicationController def assign_user if 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 + elsif params[:action] == "confirm"# confirms 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] |