diff --git a/engines/adva_cms/locale/adva_cms/en.yml b/engines/adva_cms/locale/adva_cms/en.yml index 37ca63a33..b7f0fd818 100644 --- a/engines/adva_cms/locale/adva_cms/en.yml +++ b/engines/adva_cms/locale/adva_cms/en.yml @@ -751,9 +751,13 @@ en: topics: Topics subscription: no_subscriptions: There are no subscribers. + confirm_delete: Are you sure you want unsubscribe? + flash: + destroy_success: Successfully unsubsribed. link: index: Subscribers new: Add a new subscriber + destroy: Unsubscribe label: user: Users subscriber: Subscriber diff --git a/engines/adva_newsletter/app/controllers/admin/newsletter_subscriptions_controller.rb b/engines/adva_newsletter/app/controllers/admin/newsletter_subscriptions_controller.rb index 30d22f6ca..83b5d3ac8 100644 --- a/engines/adva_newsletter/app/controllers/admin/newsletter_subscriptions_controller.rb +++ b/engines/adva_newsletter/app/controllers/admin/newsletter_subscriptions_controller.rb @@ -20,4 +20,11 @@ def create render :action => 'new' end end + + def destroy + @subscription = Subscription.find(params[:id]) + @subscription.destroy + flash[:notice] = t('adva.subscription.flash.destroy_success') + redirect_to admin_subscriptions_path(@site, @subscription.subscribable_id) + end end diff --git a/engines/adva_newsletter/app/views/admin/newsletter_subscriptions/_subscriptions.html.erb b/engines/adva_newsletter/app/views/admin/newsletter_subscriptions/_subscriptions.html.erb index 49e1c7f5b..ca6735a6c 100644 --- a/engines/adva_newsletter/app/views/admin/newsletter_subscriptions/_subscriptions.html.erb +++ b/engines/adva_newsletter/app/views/admin/newsletter_subscriptions/_subscriptions.html.erb @@ -14,7 +14,12 @@ <%= link_to h(subscription.user.name), admin_user_path(subscription.user_id) %> <%= subscription.user.email %> <%= subscription.created_at.to_s(:db) %> -   + + + <% end %> diff --git a/engines/adva_newsletter/test/integration/subscription_test.rb b/engines/adva_newsletter/test/integration/subscription_test.rb index 713d66f31..b233df4bd 100644 --- a/engines/adva_newsletter/test/integration/subscription_test.rb +++ b/engines/adva_newsletter/test/integration/subscription_test.rb @@ -37,6 +37,9 @@ def setup assert_template 'admin/newsletter_subscriptions/new' assert_content 'Site does not have any available user' click_link 'Add a new user' + + # admin unsubscribe John Doe + # TODO: bring on selenium test for that end end