External-Mirrors/awx
2
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2026-04-11 04:59:22 -02:30
Code Issues Packages Projects Releases Wiki Activity

flake8 fixes

Browse Source
This commit is contained in:
Akita Noek
2016-03-22 08:05:04 -04:00
parent 7d932b6633
commit d8f527429c
3 changed files with 4 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
awx/api/views.py
View File

@@ -1008,8 +1008,7 @@ class UserTeamsList(ListAPIView):
u = User.objects.get(pk=self.kwargs['pk']) u = User.objects.get(pk=self.kwargs['pk'])
if not u.accessible_by(self.request.user, {'read': True}): if not u.accessible_by(self.request.user, {'read': True}):
raise PermissionDenied() raise PermissionDenied()
return Team.accessible_objects(self.request.user, {'read': True}) \ return Team.accessible_objects(self.request.user, {'read': True}).filter(member_role__members=u)
.filter(member_role__members=u)
class UserRolesList(SubListCreateAttachDetachAPIView): class UserRolesList(SubListCreateAttachDetachAPIView):

10
awx/main/fields.py
View File

@@ -2,7 +2,6 @@
# All Rights Reserved. # All Rights Reserved.
# Django # Django
from django.db import connection
from django.db.models.signals import ( from django.db.models.signals import (
post_init, post_init,
pre_save, pre_save,
@@ -19,10 +18,6 @@ from django.db.models.fields.related import (
ReverseManyRelatedObjectsDescriptor, ReverseManyRelatedObjectsDescriptor,
) )
from django.core.exceptions import FieldError
from django.db.transaction import TransactionManagementError
# AWX # AWX
from awx.main.models.rbac import RolePermission, Role, batch_role_ancestor_rebuilding from awx.main.models.rbac import RolePermission, Role, batch_role_ancestor_rebuilding
@@ -182,8 +177,9 @@ class ImplicitRoleField(models.ForeignKey):
if role: if role:
return role return role
role = Role.objects.create( role = Role.objects.create(
name=self.role_name, name=self.role_name,
description=self.role_description) description=self.role_description
)
setattr(instance, self.name, role) setattr(instance, self.name, role)
def _patch_role_content_object_and_grant_permissions(self, instance): def _patch_role_content_object_and_grant_permissions(self, instance):

1
awx/main/models/projects.py
View File

@@ -27,7 +27,6 @@ from awx.main.utils import update_scm_url
from awx.main.fields import ImplicitRoleField from awx.main.fields import ImplicitRoleField
from awx.main.conf import tower_settings from awx.main.conf import tower_settings
from awx.main.models.rbac import ( from awx.main.models.rbac import (
ALL_PERMISSIONS,
ROLE_SINGLETON_SYSTEM_ADMINISTRATOR, ROLE_SINGLETON_SYSTEM_ADMINISTRATOR,
ROLE_SINGLETON_SYSTEM_AUDITOR, ROLE_SINGLETON_SYSTEM_AUDITOR,
) )