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

polish mailboxer with bug fixes

Browse source
This commit is contained in:
Devin Howard 2016-12-09 11:55:53 -05:00
parent 3f6f020ce1
commit 88e98c7342
7 changed files with 19 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/assets/stylesheets/clean.css.erb
View file

@ -625,7 +625,7 @@
.sidebarForkIcon div:after,
.sidebarFilterIcon div:after,
.notificationsIcon div:after,
.sidebarAccountIcon .tooltipsUnder:after,
.sidebarAccountIcon .tooltipsUnder:after {
content: '';
position: absolute;
right: 40%;

5
app/controllers/access_controller.rb
View file

@ -36,8 +36,9 @@ class AccessController < ApplicationController
@map.add_new_collaborators(user_ids).each do |user_id|
# add_new_collaborators returns array of added users,
# who we then send an email to
mail = MapMailer.invite_to_edit_email(@map, current_user, User.find(user_id))
user.notify(mail.subject, 'invite to edit', UserMap.find_by(user_id: user_id, map: @map), true, MAILBOXER_CODE_INVITED_TO_EDIT)
user = User.find(user_id)
mail = MapMailer.invite_to_edit_email(@map, current_user, user)
user.notify(mail.subject, 'invite to edit', UserMap.find_by(user: user, map: @map), true, MAILBOXER_CODE_INVITED_TO_EDIT)
end
@map.remove_old_collaborators(user_ids)

4
app/models/access_request.rb
View file

@ -11,9 +11,9 @@ class AccessRequest < ApplicationRecord
Mailboxer::Receipt.where(notification: notification).update_all(is_read: true)
end
UserMap.create(user: user, map: map)
user_map = UserMap.create(user: user, map: map)
mail = MapMailer.invite_to_edit_email(map, map.user, user)
user.notify(mail.subject, 'invite to edit', self, true, MAILBOXER_CODE_INVITED_TO_EDIT)
user.notify(mail.subject, 'invite to edit', user_map, true, MAILBOXER_CODE_INVITED_TO_EDIT)
end
def deny

6
app/views/mailboxer/notification_mailer/new_notification_email.html.erb
View file

@ -1,4 +1,6 @@
<!DOCTYPE html>
<% mail = ApplicationMailer.mail_for_notification(@notification) %>
<% @notification.update(body: mail.html_part&.body&.decoded) %>
<%= raw mail.html_part&.body&.decoded %>
<% if mail %>
<% @notification.update(body: mail.html_part&.body&.decoded) %>
<%= raw mail.html_part&.body&.decoded %>
<% end %>

4
app/views/mailboxer/notification_mailer/new_notification_email.text.erb
View file

@ -1,2 +1,4 @@
<% mail = ApplicationMailer.mail_for_notification(@notification) %>
<%= mail.text_part&.body&.decoded %>
<% if mail %>
<%= mail.text_part&.body&.decoded %>
<% end %>

10
config/environments/production.rb
View file

@ -1,16 +1,16 @@
# frozen_string_literal: true
Rails.application.configure do
# Settings specified here will take precedence over those in config/application.rb
config.log_level = :warn
config.eager_load = true
# 12 factor: log to stdout
logger = ActiveSupport::Logger.new(STDOUT)
# log to stdout
logger = Logger.new(STDOUT)
logger.formatter = config.log_formatter
logger.level = :warn
config.logger = ActiveSupport::TaggedLogging.new(logger)
# Code is not reloaded between requests
config.eager_load = true
config.cache_classes = true
# Full error reports are disabled and caching is turned on

2
config/initializers/mailboxer.rb
View file

@ -15,7 +15,7 @@ Mailboxer.setup do |config|
config.uses_emails = true
# Configures the default from for emails sent for Messages and Notifications
config.default_from = 'no-reply@metamaps.cc'
config.default_from = 'team@metamaps.cc'
# Configures the methods needed by mailboxer
config.email_method = :mailboxer_email