summaryrefslogtreecommitdiff
path: root/billing/app/controllers/subscriptions_controller.rb
diff options
context:
space:
mode:
authorjessib <jessib@riseup.net>2013-10-17 13:58:54 -0700
committerjessib <jessib@riseup.net>2013-10-17 13:58:54 -0700
commit92cb054d53aaac6864a6a805d9cdd3919f4a38bc (patch)
tree5751471169043c1b1867d9640551ae5cd2c8380e /billing/app/controllers/subscriptions_controller.rb
parenta6f32017f5c7802798f10e2f4041037fb5684def (diff)
Some cleanup of code to deal with past due subscriptions.
Diffstat (limited to 'billing/app/controllers/subscriptions_controller.rb')
-rw-r--r--billing/app/controllers/subscriptions_controller.rb6
1 files changed, 3 insertions, 3 deletions
diff --git a/billing/app/controllers/subscriptions_controller.rb b/billing/app/controllers/subscriptions_controller.rb
index 0a1c733..01aaab4 100644
--- a/billing/app/controllers/subscriptions_controller.rb
+++ b/billing/app/controllers/subscriptions_controller.rb
@@ -1,7 +1,7 @@
class SubscriptionsController < BillingBaseController
before_filter :authorize
before_filter :fetch_subscription, :only => [:show, :destroy]
- before_filter :only_admin_active_pending, :only => [:destroy]
+ before_filter :confirm_cancel_subscription, :only => [:destroy]
before_filter :confirm_self_or_admin, :only => [:index]
before_filter :confirm_no_pending_active_pastdue_subscription, :only => [:new, :create]
# for now, admins cannot create or destroy subscriptions for others:
@@ -41,8 +41,8 @@ class SubscriptionsController < BillingBaseController
end
- def only_admin_active_pending
- access_denied unless admin? or ['Pending', 'Active'].include? @subscription.status
+ def confirm_cancel_subscription
+ access_denied unless view_context.allow_cancel_subscription(@subscription)
end
def confirm_no_pending_active_pastdue_subscription