diff --git a/app/assets/stylesheets/clean.css.erb b/app/assets/stylesheets/clean.css.erb index f4352504..fb55b29f 100644 --- a/app/assets/stylesheets/clean.css.erb +++ b/app/assets/stylesheets/clean.css.erb @@ -625,7 +625,7 @@ .sidebarForkIcon div:after, .sidebarFilterIcon div:after, .notificationsIcon div:after, -.sidebarAccountIcon .tooltipsUnder:after, +.sidebarAccountIcon .tooltipsUnder:after { content: ''; position: absolute; right: 40%; diff --git a/app/controllers/access_controller.rb b/app/controllers/access_controller.rb index d3808a1a..6f3518d5 100644 --- a/app/controllers/access_controller.rb +++ b/app/controllers/access_controller.rb @@ -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) diff --git a/app/models/access_request.rb b/app/models/access_request.rb index 504e0ff2..d062ab79 100644 --- a/app/models/access_request.rb +++ b/app/models/access_request.rb @@ -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 diff --git a/app/views/mailboxer/notification_mailer/new_notification_email.html.erb b/app/views/mailboxer/notification_mailer/new_notification_email.html.erb index d8fda23c..87d8da33 100644 --- a/app/views/mailboxer/notification_mailer/new_notification_email.html.erb +++ b/app/views/mailboxer/notification_mailer/new_notification_email.html.erb @@ -1,4 +1,6 @@ <% 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 %> diff --git a/app/views/mailboxer/notification_mailer/new_notification_email.text.erb b/app/views/mailboxer/notification_mailer/new_notification_email.text.erb index 45fa8ae0..58623b16 100644 --- a/app/views/mailboxer/notification_mailer/new_notification_email.text.erb +++ b/app/views/mailboxer/notification_mailer/new_notification_email.text.erb @@ -1,2 +1,4 @@ <% mail = ApplicationMailer.mail_for_notification(@notification) %> -<%= mail.text_part&.body&.decoded %> +<% if mail %> + <%= mail.text_part&.body&.decoded %> +<% end %> diff --git a/config/environments/production.rb b/config/environments/production.rb index d3f8794e..ab4769b6 100644 --- a/config/environments/production.rb +++ b/config/environments/production.rb @@ -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 diff --git a/config/initializers/mailboxer.rb b/config/initializers/mailboxer.rb index 115d80a4..b937df92 100644 --- a/config/initializers/mailboxer.rb +++ b/config/initializers/mailboxer.rb @@ -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