diff --git a/admin/users/views.py b/admin/users/views.py index 85b6eac4ee6..6976c978eec 100644 --- a/admin/users/views.py +++ b/admin/users/views.py @@ -456,9 +456,6 @@ def get_context_data(self, **kwargs): class GetUserConfirmationLink(GetUserLink): def get_link(self, user): - if user.is_confirmed: - return f'User {user._id} is already confirmed' - if user.deleted or user.is_merged: return f'User {user._id} is deleted or merged' diff --git a/osf/management/commands/deactivate_requested_accounts.py b/osf/management/commands/deactivate_requested_accounts.py index 9a3ddcf5356..512fb34eeef 100644 --- a/osf/management/commands/deactivate_requested_accounts.py +++ b/osf/management/commands/deactivate_requested_accounts.py @@ -31,7 +31,6 @@ def deactivate_requested_accounts(dry_run=True): logger.info(f'Disabling user {user._id}.') if not dry_run: user.deactivate_account() - user.is_registered = False mails.send_mail( to_addr=user.username, mail=mails.REQUEST_DEACTIVATION_COMPLETE, diff --git a/osf/models/mixins.py b/osf/models/mixins.py index 6f1c7f36f6f..a4b4bb55e25 100644 --- a/osf/models/mixins.py +++ b/osf/models/mixins.py @@ -2222,7 +2222,6 @@ def suspend_spam_user(self, user): user.flag_spam() if not user.is_disabled: user.deactivate_account() - user.is_registered = False mails.send_mail( to_addr=user.username, mail=mails.SPAM_USER_BANNED, diff --git a/osf/models/user.py b/osf/models/user.py index fa1d4ec254a..89d245786a4 100644 --- a/osf/models/user.py +++ b/osf/models/user.py @@ -1284,7 +1284,7 @@ def add_unconfirmed_email(self, email, expiration=None, external_identity=None, validate_email(email) if not external_identity and self.emails.filter(address=email).exists(): - if not force or self.is_confirmed: + if not force and self.is_confirmed: raise ValueError('Email already confirmed to this user.') # If the unconfirmed email is already present, refresh the token