glenux-contrib/metamaps--metamaps
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

little fixes

Browse source
This commit is contained in:
Connor Turland 2017-02-10 00:32:15 +00:00
parent dde097ea75
commit 915defcd1b
3 changed files with 4 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/mailers/map_mailer.rb
View file

@ -17,6 +17,6 @@ class MapMailer < ApplicationMailer
def invite_to_edit(user_map) def invite_to_edit(user_map)
@inviter = user_map.map.user @inviter = user_map.map.user
@map = user_map.map @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
end end

2
app/services/notification_service.rb
View file

@ -46,7 +46,7 @@ class NotificationService
template = get_template_for_event_type(event_type) template = get_template_for_event_type(event_type)
mailboxer_code = get_mailboxer_code_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) 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 end
# note: this is a global function, probably called from the rails console with some html body # note: this is a global function, probably called from the rails console with some html body

3
app/views/notifications/index.html.erb
View file

@ -7,7 +7,8 @@
<h2 class="title">Notifications</h4> <h2 class="title">Notifications</h4>
</header> </header>
<ul class="notifications"> <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| %> <% notifications.each do |notification| %>
<% receipt = @receipts.find_by(notification_id: notification.id) %> <% receipt = @receipts.find_by(notification_id: notification.id) %>
<li class="notification <%= receipt.is_read? ? 'read' : 'unread' %>" id="notification-<%= notification.id %>"> <li class="notification <%= receipt.is_read? ? 'read' : 'unread' %>" id="notification-<%= notification.id %>">