diff options
| author | azul <azul@riseup.net> | 2013-09-18 00:27:15 -0700 |
|---|---|---|
| committer | azul <azul@riseup.net> | 2013-09-18 00:27:15 -0700 |
| commit | 22e6f781caec701a4d041e0ac183df4c955e89c2 (patch) | |
| tree | d07f7d83f292951d78a06d81ee06eac81aae5206 /billing/app/controllers | |
| parent | b7ab1a00f7a8ac15d364a6597701f5fcc891ca78 (diff) | |
| parent | 7262c7c1d37dd57c102bb41de3a15aa15f720056 (diff) | |
Merge pull request #83 from jessib/feature/billing_admin_cancel_subscriptions
Feature/billing admin cancel 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? |