From 915defcd1b4c84ce78abedf6bcafdf72998bcfca Mon Sep 17 00:00:00 2001
From: Connor Turland <connorturland@gmail.com>
Date: Fri, 10 Feb 2017 00:32:15 +0000
Subject: [PATCH] little fixes

---
 app/mailers/map_mailer.rb              | 2 +-
 app/services/notification_service.rb   | 2 +-
 app/views/notifications/index.html.erb | 3 ++-
 3 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/app/mailers/map_mailer.rb b/app/mailers/map_mailer.rb
index e627efa6..c14e9c65 100644
--- a/app/mailers/map_mailer.rb
+++ b/app/mailers/map_mailer.rb
@@ -17,6 +17,6 @@ class MapMailer < ApplicationMailer
   def invite_to_edit(user_map)
     @inviter = user_map.map.user
     @map = user_map.map
-    mail(to: user_map.user.email, subject: map.invited_text)
+    mail(to: user_map.user.email, subject: @map.invited_text)
   end
 end
diff --git a/app/services/notification_service.rb b/app/services/notification_service.rb
index c1081db5..c590a5ca 100644
--- a/app/services/notification_service.rb
+++ b/app/services/notification_service.rb
@@ -46,7 +46,7 @@ class NotificationService
     template = get_template_for_event_type(event_type)
     mailboxer_code = get_mailboxer_code_for_event_type(event_type)
     body = renderer.render(template: template, locals: { map: user_map.map, inviter: user_map.map.user }, layout: false)
-    user_map.user.notify(map.invited_text, body, user_map, false, mailboxer_code, true, user_map.map.user)
+    user_map.user.notify(user_map.map.invited_text, body, user_map, false, mailboxer_code, true, user_map.map.user)
   end
 
   # note: this is a global function, probably called from the rails console with some html body
diff --git a/app/views/notifications/index.html.erb b/app/views/notifications/index.html.erb
index f27c1fef..a49c9602 100644
--- a/app/views/notifications/index.html.erb
+++ b/app/views/notifications/index.html.erb
@@ -7,7 +7,8 @@
       <h2 class="title">Notifications</h4>
     </header>
     <ul class="notifications">
-      <% notifications = @notifications.to_a.delete_if{|n| n.notified_object.nil? || n.notified_object.map.nil? }%> 
+      <% blacklist = [MAILBOXER_CODE_ACCESS_REQUEST, MAILBOXER_CODE_ACCESS_APPROVED, MAILBOXER_CODE_INVITE_TO_EDIT] %>
+      <% notifications = @notifications.to_a.delete_if{|n| blacklist.include?(n.notification_code) && (n.notified_object.nil? || n.notified_object.map.nil?) }%> 
       <% notifications.each do |notification| %>
         <% receipt = @receipts.find_by(notification_id: notification.id) %>
         <li class="notification <%= receipt.is_read? ? 'read' : 'unread' %>" id="notification-<%= notification.id %>">