diff options
| author | jessib <jessib@riseup.net> | 2013-09-09 14:52:31 -0700 |
|---|---|---|
| committer | jessib <jessib@riseup.net> | 2013-09-09 14:52:31 -0700 |
| commit | b8cf64edc4f7e77075b1931a13ce4c4cd7c21621 (patch) | |
| tree | f90d63865f2adcd349f3219912606abf24a238ca /billing/app/controllers | |
| parent | e11c158a15d54aea0eaefe698e7466634bacf204 (diff) | |
First run at having admins cancel user subscriptions.
Diffstat (limited to 'billing/app/controllers')
| -rw-r--r-- | billing/app/controllers/billing_base_controller.rb | 2 | ||||
| -rw-r--r-- | billing/app/controllers/subscriptions_controller.rb | 2 |
2 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 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] diff --git a/billing/app/controllers/subscriptions_controller.rb b/billing/app/controllers/subscriptions_controller.rb index 4047847..4b1851a 100644 --- a/billing/app/controllers/subscriptions_controller.rb +++ b/billing/app/controllers/subscriptions_controller.rb @@ -3,7 +3,7 @@ class SubscriptionsController < BillingBaseController before_filter :fetch_subscription, :only => [:show, :destroy] before_filter :confirm_no_active_subscription, :only => [:new, :create] # for now, admins cannot create or destroy subscriptions for others: - before_filter :confirm_self, :only => [:destroy, :new, :create] + before_filter :confirm_self, :only => [:new, :create] def new # don't show link to subscribe if they are already subscribed? |