lino.jorzick/greenlight
1
0
Fork 0
forked from External/greenlight
Code Issues Pull Requests Projects Releases Wiki Activity

Revert "Notify admins when a approval/invite user signs up"

Browse Source 
This reverts commit 251d85d88a.
This commit is contained in:
shawn-higgins1
2019-05-21 14:37:27 -04:00
parent 251d85d88a
commit 0360c78219
12 changed files with 2 additions and 270 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
app/controllers/users_controller.rb
View File

@ -50,8 +50,6 @@ class UsersController < ApplicationController
flash: { success: I18n.t("registration.approval.signup") } unless Rails.configuration.enable_email_verification
end
send_registration_email if Rails.configuration.enable_email_verification
# Sign in automatically if email verification is disabled or if user is already verified.
login(@user) && return if !Rails.configuration.enable_email_verification || @user.email_verified
@ -195,19 +193,6 @@ class UsersController < ApplicationController
end
end
def send_registration_email
begin
if invite_registration
send_invite_user_signup_email(@user)
elsif approval_registration
send_approval_user_signup_email(@user)
end
rescue => e
logger.error "Error in email delivery: #{e}"
flash[:alert] = I18n.t(params[:message], default: I18n.t("delivery_error"))
end
end
# Add validation errors to model if they exist
def valid_user_or_captcha
valid_user = @user.valid?