diff --git a/spa/api/v1/ActivityResource.py b/spa/api/v1/ActivityResource.py index ee63aca..a4a4321 100644 --- a/spa/api/v1/ActivityResource.py +++ b/spa/api/v1/ActivityResource.py @@ -21,7 +21,7 @@ class ActivityResource(BackboneCompatibleResource): try: pdb.set_trace() if bundle.obj.user is not None and bundle.obj.user.get_profile() is not None: - user_name = bundle.obj.user.get_profile().nice_name() + user_name = bundle.obj.user.get_profile().get_nice_name() user_image = bundle.obj.user.get_profile().get_small_profile_image() user_profile = bundle.obj.user.get_profile().get_profile_url() else: diff --git a/spa/api/v1/CommentResource.py b/spa/api/v1/CommentResource.py index 198b7a7..6be427d 100644 --- a/spa/api/v1/CommentResource.py +++ b/spa/api/v1/CommentResource.py @@ -28,5 +28,5 @@ class CommentResource(BackboneCompatibleResource): def dehydrate(self, bundle): bundle.data['avatar_image'] = bundle.obj.user.get_profile().get_small_profile_image() bundle.data['user_url'] = bundle.obj.user.get_absolute_url() - bundle.data['user_name'] = bundle.obj.user.get_profile().nice_name() or bundle.obj.user.get_profile().display_name + bundle.data['user_name'] = bundle.obj.user.get_profile().get_nice_name() or bundle.obj.user.get_profile().display_name return bundle diff --git a/spa/api/v1/MixResource.py b/spa/api/v1/MixResource.py index fc91ef7..2c68080 100644 --- a/spa/api/v1/MixResource.py +++ b/spa/api/v1/MixResource.py @@ -110,7 +110,7 @@ class MixResource(BackboneCompatibleResource): def dehydrate(self, bundle): bundle.data['waveform_url'] = bundle.obj.get_waveform_url() - bundle.data['user_name'] = bundle.obj.user.nice_name() + bundle.data['user_name'] = bundle.obj.user.get_nice_name() bundle.data['user_profile_url'] = bundle.obj.user.get_absolute_url() bundle.data['user_profile_image'] = bundle.obj.user.get_small_profile_image() bundle.data['item_url'] = 'mix/%s' % bundle.obj.id diff --git a/spa/social.py b/spa/social.py index dda3031..8cffc0d 100644 --- a/spa/social.py +++ b/spa/social.py @@ -90,7 +90,7 @@ def user(request, args): profile_url = user.get_profile_url() default = _getPayload(request) extras = { - "description": user.nice_name, + "description": user.get_nice_name, "profile_url": profile_url, "image_url": image, }