Skip to content

Commit af875a9

Browse files
committed
Fix linting issues
1 parent 4eca510 commit af875a9

File tree

4 files changed

+15
-7
lines changed

4 files changed

+15
-7
lines changed

multinet/api/views/common.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ def get_parents_query_dict(self):
6161
# Replace the standard lookup field with one that (possibly) goes
6262
# through the session object's related network or table object.
6363
new_field = self.workspace_field
64-
if not new_field in parents_query_dict:
64+
if new_field not in parents_query_dict:
6565
old_field = 'workspace__name'
6666
parents_query_dict[new_field] = parents_query_dict.pop(old_field)
6767

multinet/api/views/network.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,8 @@
2020
NetworkReturnDetailSerializer,
2121
NetworkReturnSerializer,
2222
NetworkSerializer,
23-
NetworkTablesSerializer,
2423
NetworkSessionSerializer,
24+
NetworkTablesSerializer,
2525
PaginatedResultSerializer,
2626
TableReturnSerializer,
2727
)

multinet/api/views/session.py

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,10 +12,10 @@
1212
from rest_framework.response import Response
1313
from rest_framework.viewsets import GenericViewSet
1414

15-
from ..models import NetworkSession, TableSession, Workspace, WorkspaceRoleChoice
1615
from ..auth.decorators import require_workspace_permission
16+
from ..models import NetworkSession, TableSession, Workspace, WorkspaceRoleChoice
17+
from .common import NetworkWorkspaceChildMixin, TableWorkspaceChildMixin
1718
from .serializers import NetworkSessionSerializer, TableSessionSerializer
18-
from .common import TableWorkspaceChildMixin, NetworkWorkspaceChildMixin
1919

2020

2121
class SessionCreateSerializer(serializers.Serializer):
@@ -49,7 +49,9 @@ def state(self, request, parent_lookup_workspace__name: str, pk=None):
4949
session = self.get_object()
5050

5151
workspace: Workspace = get_object_or_404(Workspace, name=parent_lookup_workspace__name)
52-
session_ws = session.table.workspace if hasattr(session, 'table') else session.network.workspace
52+
session_ws = (
53+
session.table.workspace if hasattr(session, 'table') else session.network.workspace
54+
)
5355
if workspace.id != session_ws.id:
5456
raise Http404
5557

multinet/api/views/table.py

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,13 @@
1212
from rest_framework.viewsets import ReadOnlyModelViewSet
1313

1414
from multinet.api.auth.decorators import require_workspace_permission
15-
from multinet.api.models import Table, TableSession, TableTypeAnnotation, Workspace, WorkspaceRoleChoice
15+
from multinet.api.models import (
16+
Table,
17+
TableSession,
18+
TableTypeAnnotation,
19+
Workspace,
20+
WorkspaceRoleChoice,
21+
)
1622
from multinet.api.utils.arango import ArangoQuery
1723
from multinet.api.views.serializers import (
1824
PaginatedResultSerializer,
@@ -163,7 +169,7 @@ def sessions(self, request, parent_lookup_workspace__name: str, name: str):
163169
workspace: Workspace = get_object_or_404(Workspace, name=parent_lookup_workspace__name)
164170
table: Table = get_object_or_404(Table, workspace=workspace, name=name)
165171

166-
sessions = TableSession.objects.filter(network=network.id)
172+
sessions = TableSession.objects.filter(table=table.id)
167173
serializer = TableSessionSerializer(sessions, many=True)
168174

169175
return Response(serializer.data, status=status.HTTP_200_OK)

0 commit comments

Comments
 (0)