Merge ce56d1f into f72d441

5monkeys · Oct 10, 2013 · a0ec538 · a0ec538
2 parents f72d441 + ce56d1f
commit a0ec538
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 1 deletion.
diff --git a/djedi/admin/api.py b/djedi/admin/api.py
@@ -96,7 +96,7 @@ def post(self, request, uri):
         """
         uri = self.decode_uri(uri)
         data, meta = self.get_post_data(request)
-        meta['author'] = request.user.username
+        meta['author'] = auth.get_username(request.user)
         node = cio.set(uri, data, publish=False, **meta)
         return self.render_to_json(node)
 

diff --git a/djedi/auth/__init__.py b/djedi/auth/__init__.py
@@ -7,3 +7,10 @@ def has_permission(user):
             return True
 
     return False
+
+
+def get_username(user):
+    if hasattr(user, 'get_username'):
+        return user.get_username()
+    else:
+        return user.username