Merge pull request #737 from jramnai/jramnai/create_moderator

[FIX] #546 - create_moderator command if User has no Profile

2 files changed, 6 insertions, 1 deletions

diff --git a/yaksh/management/commands/create_moderator.py b/yaksh/management/commands/create_moderator.py
index 3ec012e..c0f160a 100644
--- a/yaksh/management/commands/create_moderator.py
+++ b/yaksh/management/commands/create_moderator.py
@@ -10,6 +10,7 @@ from django.contrib.auth.models import User, Group, Permission
 
 # local imports
 from yaksh.models import create_group
+from yaksh.views import _create_or_update_profile
 
 
 class Command(BaseCommand):
@@ -43,6 +44,10 @@ class Command(BaseCommand):
                         )
                     )
                 else:
+                    if not hasattr(user, 'profile'):
+                        _create_or_update_profile(user,
+                                                  {'is_email_verified': True}
+                                                  )
                     user.profile.is_moderator = True
                     user.profile.save()
                     self.stdout.write(
diff --git a/yaksh/models.py b/yaksh/models.py
index e2b9952..50e9363 100644
--- a/yaksh/models.py
+++ b/yaksh/models.py
@@ -1331,7 +1331,7 @@ class Profile(models.Model):
         super(Profile, self).save(*args, **kwargs)
 
     def __str__(self):
-        return '%s' % (self.user.get_full_name())
+        return '%s' % (self.user.get_full_name() or self.user.username)
 
 
 ###############################################################################