commit 79222572a2de93f2cc24f6d6e9ac94d075495ddb
author Sapan Bhatia <sapan@opennetworking.org> Fri Sep 01 23:18:14 2017 -0400
committer Scott Baker <scottb@onlab.us> Mon Sep 11 14:44:10 2017 -0700
tree bc6a8ebdf0e0d0ecac5499aaf016f4649c3f2f2d
parent 1c5d6078cbdd1eef64830fa1a2ed391e0b6e7a5c

CORD-1746: Username defaulting to email even when it is set

Change-Id: Ibdfcbf6eb81a4d25ae2664e1ca888beb1cafcc92
(cherry picked from commit 8a34a8ecdff58bafc9a6e0f04fe156db8e56fcc3)

README.md

diff --git a/README.md b/README.md
index 0b93d3f..dc673ad 100644
--- a/README.md
+++ b/README.md
@@ -21,3 +21,4 @@
 version is configured with a service graph that includes
 `ExampleService`, which is a good platform for understanding how to
 build and use XOS.
+

xos/core/models/user.py

diff --git a/xos/core/models/user.py b/xos/core/models/user.py
index e4306c5..d8dd616 100644
--- a/xos/core/models/user.py
+++ b/xos/core/models/user.py
@@ -299,7 +299,8 @@
         if (caller_kind!="synchronizer") or always_update_timestamp:
             self.updated = timezone.now()
 
-        self.username = self.email
+        if not self.username:
+            self.username = self.email
 
         super(User, self).save(*args, **kwargs)