From 5c79bdab5c48fbbbfebdf70433dc2d6655d83491 Mon Sep 17 00:00:00 2001 From: Seth Call Date: Sat, 20 Jun 2015 14:49:11 -0500 Subject: [PATCH] * make unsubscribed work, and only dump first_name --- admin/app/views/email/dump_emailables.csv.erb | 2 +- web/app/controllers/users_controller.rb | 8 +++++--- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/admin/app/views/email/dump_emailables.csv.erb b/admin/app/views/email/dump_emailables.csv.erb index 778d5dc89..efa44b0f8 100644 --- a/admin/app/views/email/dump_emailables.csv.erb +++ b/admin/app/views/email/dump_emailables.csv.erb @@ -1,2 +1,2 @@ <%- headers = ['email', 'name', 'unsubscribe_token'] -%> -<%= CSV.generate_line headers %><%- @users.each do |user| -%><%= CSV.generate_line([user.email, user.name, user.unsubscribe_token]) %><%- end -%> \ No newline at end of file +<%= CSV.generate_line headers %><%- @users.each do |user| -%><%= CSV.generate_line([user.email, user.first_name, user.unsubscribe_token]) %><%- end -%> \ No newline at end of file diff --git a/web/app/controllers/users_controller.rb b/web/app/controllers/users_controller.rb index 92fbb1f52..7824a0fe8 100644 --- a/web/app/controllers/users_controller.rb +++ b/web/app/controllers/users_controller.rb @@ -402,12 +402,14 @@ JS redirect_to '/' end if params[:user_token].present? - if request.get? + #if request.get? - elsif request.post? + #elsif request.post? @user.subscribe_email = false @user.save! - end + #end + + render text: 'You have been unsubscribed.' end private