From ab4ae432793f8e45aa201390d59da1c6378ccfff Mon Sep 17 00:00:00 2001 From: Fergal Moran Date: Thu, 28 Aug 2014 20:29:14 +0100 Subject: [PATCH] Fixed radio buttons in user profile view --- spa/management/commands/processuser.py | 28 ----------------- spa/models/userprofile.py | 9 +----- static/js/dss/templates/sidebarleftnav.jst | 2 +- static/js/dss/templates/usereditview.jst | 35 ++++++++++++---------- 4 files changed, 22 insertions(+), 52 deletions(-) delete mode 100755 spa/management/commands/processuser.py diff --git a/spa/management/commands/processuser.py b/spa/management/commands/processuser.py deleted file mode 100755 index 23d1622..0000000 --- a/spa/management/commands/processuser.py +++ /dev/null @@ -1,28 +0,0 @@ -from django.contrib.auth.models import User -from django.core.exceptions import ObjectDoesNotExist -from django.core.management.base import NoArgsCommand, CommandError -from spa.models import UserProfile -from core.utils.url import unique_slugify - -class Command(NoArgsCommand): - help = "Updates audio files with their durations" - - def handle(user, *args, **options): - try: - candidates = User.objects.all() - for user in candidates: - try: - profile = user.get_profile() - except ObjectDoesNotExist, ce: - print "Creating profile for %s" % user.get_username() - UserProfile.objects.create(user=user) - profile = user.get_profile() - - if profile.slug is None or profile.slug == '': - profile.slug = unique_slugify(profile, user.get_username()) - print "Slugified: %s" % profile.slug - profile.save() - - user.save() - except Exception, ex: - raise CommandError(ex.message) diff --git a/spa/models/userprofile.py b/spa/models/userprofile.py index 02fd786..1f99a2e 100755 --- a/spa/models/userprofile.py +++ b/spa/models/userprofile.py @@ -67,21 +67,14 @@ class UserProfile(BaseModel): Save Photo after ensuring it is not blank. Resize as needed. """ if self.slug is None or self.slug == '': - self.slug = unique_slugify(self, self.get_username()) + self.slug = unique_slugify(self, self.user.get_username()) print "Slugified: %s" % self.slug - """ - Check if follower has been added - """ - l = self.get_dirty_fields() - return super(UserProfile, self).save(force_insert, force_update, using, update_fields) def get_username(self): return self.user.username - username = property(get_username) - def get_email(self): return self.user.email diff --git a/static/js/dss/templates/sidebarleftnav.jst b/static/js/dss/templates/sidebarleftnav.jst index 00766ce..a4f1a69 100644 --- a/static/js/dss/templates/sidebarleftnav.jst +++ b/static/js/dss/templates/sidebarleftnav.jst @@ -84,7 +84,7 @@ My Profile -
  • +
  • Settings diff --git a/static/js/dss/templates/usereditview.jst b/static/js/dss/templates/usereditview.jst index af64b09..fb0eb53 100644 --- a/static/js/dss/templates/usereditview.jst +++ b/static/js/dss/templates/usereditview.jst @@ -33,22 +33,27 @@ value="<%= email %>"> -
    - -
    -