diff --git a/dss/settings.py b/dss/settings.py index 517574a..fba4276 100755 --- a/dss/settings.py +++ b/dss/settings.py @@ -24,7 +24,6 @@ ADMINS = ( PROJECT_ROOT = os.path.dirname(os.path.abspath(__file__)) MANAGERS = ADMINS -AUTH_PROFILE_MODULE = 'spa.UserProfile' ALLOWED_HOSTS = ['*'] DATABASES = { diff --git a/spa/admin.py b/spa/admin.py index 6b443d4..dc37c75 100755 --- a/spa/admin.py +++ b/spa/admin.py @@ -11,7 +11,7 @@ from spa.models.venue import Venue class DefaultAdmin(admin.ModelAdmin): def save_model(self, request, obj, form, change): - obj.user = request.user.get_profile() + obj.user = request.user obj.save() diff --git a/spa/models/mix.py b/spa/models/mix.py index 47e5603..56e54f2 100755 --- a/spa/models/mix.py +++ b/spa/models/mix.py @@ -207,7 +207,7 @@ class Mix(BaseModel): def add_download(self, user): try: if user.is_authenticated(): - ActivityDownload(user=user.get_profile(), mix=self).save() + ActivityDownload(user=user, mix=self).save() except Exception as e: self.logger.exception("Error adding mix download: %s" % e) @@ -227,7 +227,7 @@ class Mix(BaseModel): def add_play(self, user): try: if user.is_authenticated(): - ActivityPlay(user=user.get_profile(), mix=self).save() + ActivityPlay(user=user.userprofile, mix=self).save() else: ActivityPlay(user=None, mix=self).save() @@ -240,7 +240,7 @@ class Mix(BaseModel): return if user.user.is_authenticated(): if value: - if self.favourites.filter(user=user).count() == 0: + if self.favourites.filter(user=user.user).count() == 0: fav = ActivityFavourite(user=user) # , mix=self) fav.save() self.favourites.add(user) @@ -258,7 +258,7 @@ class Mix(BaseModel): return if user.user.is_authenticated(): if value: - if self.likes.filter(user=user).count() == 0: + if self.likes.filter(user=user.user).count() == 0: v = ActivityLike(user=user, mix=self) v.save() self.likes.add(user) diff --git a/spa/models/userprofile.py b/spa/models/userprofile.py index c6c3242..c960358 100755 --- a/spa/models/userprofile.py +++ b/spa/models/userprofile.py @@ -157,7 +157,7 @@ class UserProfile(BaseModel): def is_follower(self, user): try: - return user.get_profile() in self.followers.all() + return user in self.followers.all() except Exception as ex: logger.error(ex) diff --git a/spa/signals.py b/spa/signals.py index ede77bf..8952a15 100755 --- a/spa/signals.py +++ b/spa/signals.py @@ -115,10 +115,9 @@ def session_pre_save(sender, **kwargs): uid = s.get_decoded().get('_auth_user_id') if uid is not None: try: - user = User.objects.get(pk=uid) - p = user.get_profile() - p.last_known_session = s.session_key - p.save() + user = UserProfile.objects.get(pk=uid) + user.last_known_session = s.session_key + user.save() except ObjectDoesNotExist: pass