Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 17 additions & 0 deletions src/objects/tests/admin/test_token_permissions.py
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
import json

from django.urls import reverse_lazy

import requests_mock
Expand Down Expand Up @@ -58,3 +60,18 @@ def test_get_permission_with_unavailable_objecttypes(self, m):
response = self.app.get(self.url)

self.assertEqual(response.status_code, 200)

def test_token_auth_is_preselected_in_select(self, m):
token = TokenAuthFactory()
url = f"{self.url}?token_auth={token.pk}"
page = self.app.get(url)

form_data_script = page.html.find("script", {"id": "form-data"})

self.assertIsNotNone(form_data_script)

form_data = json.loads(form_data_script.string)

token_auth_value = form_data["values"].get("token_auth")

self.assertEqual(token_auth_value, str(token.pk))
10 changes: 9 additions & 1 deletion src/objects/token/admin.py
Original file line number Diff line number Diff line change
Expand Up @@ -36,10 +36,18 @@ def get_object_fields(self):
def get_form_data(self, request, object_id) -> dict:
obj = self.get_object(request, unquote(object_id)) if object_id else None
ModelForm = self.get_form(request, obj, change=not obj)

initial = {}
token_auth_id = request.GET.get("token_auth") or request.GET.get(
"initial-token_auth"
)
if token_auth_id and not obj:
initial["token_auth"] = token_auth_id

if request.method == "POST":
form = ModelForm(request.POST, request.FILES, instance=obj)
else:
form = ModelForm(instance=obj)
form = ModelForm(instance=obj, initial=initial)
form.is_valid()

values = {field.name: field.value() for field in form}
Expand Down