File tree Expand file tree Collapse file tree
Expand file tree Collapse file tree Original file line number Diff line number Diff line change 1818from django .contrib .auth .base_user import AbstractBaseUser , BaseUserManager
1919from django .contrib .auth .hashers import check_password
2020from django .contrib .auth .models import PermissionsMixin
21+ from django .contrib .contenttypes .models import ContentType
2122from django .core .exceptions import FieldDoesNotExist
2223from django .dispatch import receiver
2324from django .db import models
@@ -877,7 +878,6 @@ def merge_user(self, user):
877878 except Exception as e :
878879 logger .exception (f'Failed to SHARE reindex preprint { preprint ._id } during user merge: { e } ' )
879880
880- from django .contrib .contenttypes .models import ContentType
881881 from osf .models import AbstractNode , Preprint
882882 from addons .osfstorage .models import OsfStorageFile
883883 node_ctype = ContentType .objects .get_for_model (AbstractNode )
You can’t perform that action at this time.
0 commit comments