From 2c85590d6590de4eaa53276bbad528b3b475cd26 Mon Sep 17 00:00:00 2001
From: Connor Turland <connorturland@gmail.com>
Date: Thu, 16 Feb 2017 13:55:19 +0000
Subject: [PATCH] fixup templates
---
app/views/topic_mailer/_unfollow.html.erb | 1 -
app/views/topic_mailer/_unfollow.text.erb | 1 -
app/views/topic_mailer/added_to_map.html.erb | 2 +-
app/views/topic_mailer/added_to_map.text.erb | 2 +-
app/views/topic_mailer/connected.html.erb | 2 +-
app/views/topic_mailer/connected.text.erb | 2 +-
6 files changed, 4 insertions(+), 6 deletions(-)
diff --git a/app/views/topic_mailer/_unfollow.html.erb b/app/views/topic_mailer/_unfollow.html.erb
index fd178254..555722a9 100644
--- a/app/views/topic_mailer/_unfollow.html.erb
+++ b/app/views/topic_mailer/_unfollow.html.erb
@@ -1,4 +1,3 @@
<hr>
-<% topic = @entity || entity %>
You are receiving this email because you are following this topic.
<%= link_to 'Unfollow', unfollow_from_email_topic_url(topic) %>
\ No newline at end of file
diff --git a/app/views/topic_mailer/_unfollow.text.erb b/app/views/topic_mailer/_unfollow.text.erb
index 50e00bd8..78128bd4 100644
--- a/app/views/topic_mailer/_unfollow.text.erb
+++ b/app/views/topic_mailer/_unfollow.text.erb
@@ -1,3 +1,2 @@
-<% topic = @entity || entity %>
You are receiving this email because you are following this topic.
To unfollow, go to: <%= unfollow_from_email_topic_url(topic) %>
\ No newline at end of file
diff --git a/app/views/topic_mailer/added_to_map.html.erb b/app/views/topic_mailer/added_to_map.html.erb
index c33eb5ba..5cdb4301 100644
--- a/app/views/topic_mailer/added_to_map.html.erb
+++ b/app/views/topic_mailer/added_to_map.html.erb
@@ -10,4 +10,4 @@
<%= link_to 'Go to Topic', topic_url(topic), style: button_style %>
<%= link_to 'Go to Map', map_url(event.map), style: button_style %>
-<%= render :partial => 'topic_mailer/unfollow' %>
\ No newline at end of file
+<%= render :partial => 'topic_mailer/unfollow', locals: { topic: topic } %>
\ No newline at end of file
diff --git a/app/views/topic_mailer/added_to_map.text.erb b/app/views/topic_mailer/added_to_map.text.erb
index 7d95bb24..67518cc6 100644
--- a/app/views/topic_mailer/added_to_map.text.erb
+++ b/app/views/topic_mailer/added_to_map.text.erb
@@ -5,4 +5,4 @@
topic_url(topic)
map_url(event.map)
-<%= render :partial => 'topic_mailer/unfollow' %>
\ No newline at end of file
+<%= render :partial => 'topic_mailer/unfollow', locals: { topic: topic } %>
\ No newline at end of file
diff --git a/app/views/topic_mailer/connected.html.erb b/app/views/topic_mailer/connected.html.erb
index 276b4a7b..65e08c04 100644
--- a/app/views/topic_mailer/connected.html.erb
+++ b/app/views/topic_mailer/connected.html.erb
@@ -14,4 +14,4 @@
<%= link_to 'View the connection', topic_url(topic1), style: button_style %>
-<%= render :partial => 'topic_mailer/unfollow' %>
\ No newline at end of file
+<%= render :partial => 'topic_mailer/unfollow', locals: { topic: topic1 } %>
\ No newline at end of file
diff --git a/app/views/topic_mailer/connected.text.erb b/app/views/topic_mailer/connected.text.erb
index 06be9d7f..e3688025 100644
--- a/app/views/topic_mailer/connected.text.erb
+++ b/app/views/topic_mailer/connected.text.erb
@@ -7,4 +7,4 @@
<%= topic_url(topic1) %>
-<%= render :partial => 'topic_mailer/unfollow' %>
\ No newline at end of file
+<%= render :partial => 'topic_mailer/unfollow', locals: { topic: topic1 } %>
\ No newline at end of file