Merge branch master into bees

endpoints/api/repository.py

@@ -82,8 +82,7 @@ class RepositoryList(ApiResource):
 
       visibility = req['visibility']
 
-      repo = model.create_repository(namespace_name, repository_name, owner,
-                                     visibility)
+      repo = model.create_repository(namespace_name, repository_name, owner, visibility)
       repo.description = req['description']
       repo.save()
 
@@ -112,7 +111,7 @@ class RepositoryList(ApiResource):
     """Fetch the list of repositories under a variety of situations."""
     def repo_view(repo_obj):
       return {
-        'namespace': repo_obj.namespace,
+        'namespace': repo_obj.namespace_user.username,
         'name': repo_obj.name,
         'description': repo_obj.description,
         'is_public': repo_obj.visibility.name == 'public',
@@ -136,7 +135,8 @@ class RepositoryList(ApiResource):
 
     response['repositories'] = [repo_view(repo) for repo in repo_query
                                 if (repo.visibility.name == 'public' or
-                                    ReadRepositoryPermission(repo.namespace, repo.name).can())]
+                                    ReadRepositoryPermission(repo.namespace_user.username,
+                                                             repo.name).can())]
 
     return response
 
@@ -171,8 +171,7 @@ class Repository(RepositoryParamResource):
     def tag_view(tag):
       return {
         'name': tag.name,
-        'image_id': tag.image.docker_image_id,
-        'dbid': tag.image.id
+        'image_id': tag.image.docker_image_id
       }
 
     organization = None