master #1

Merged
lino.jorzick merged 203 commits from External/greenlight:master into master 2021-10-02 18:19:43 +00:00
2 changed files with 2 additions and 3 deletions
Showing only changes of commit eeab951fcd - Show all commits

View File

@ -148,7 +148,8 @@ class AdminsController < ApplicationController
send_invitation_email(current_user.name, email, invitation)
end
redirect_back fallback_location: admins_path
redirect_back fallback_location: admins_path,
flash: { success: I18n.t("administrator.flash.invite", email: emails.join(", ")) }
end
# GET /admins/reset

View File

@ -78,8 +78,6 @@ module Emailer
rescue => e
logger.error "Support: Error in email delivery: #{e}"
flash[:alert] = I18n.t(params[:message], default: I18n.t("delivery_error"))
else
flash[:success] = I18n.t("administrator.flash.invite", email: email)
end
end