use new model formats, remove temp templates

This commit is contained in:
Joel Falknau 2024-12-29 21:16:59 +10:00
parent 1385a2ef16
commit d68d75bd05
No known key found for this signature in database

View File

@ -64,15 +64,17 @@ def connection_history(request) -> HttpResponse:
@login_required
@permission_required("mumble.view_connection_history")
def connection_history_data(request) -> JsonResponse:
connection_history_data = MumbleUser.objects.all(
).values(
'user',
'display_name',
'release',
'version',
'last_connect',
'last_disconnect',
)
users = MumbleUser.objects.all()
connection_history_data = []
for user in users:
connection_history_data.append({
'user': str(user),
'display_name': user.display_name,
'release': user.release,
'version': user.version,
'last_connect': user.last_connect,
'last_disconnect': user.last_disconnect,
})
return JsonResponse({"connection_history_data": list(connection_history_data)})
@ -110,7 +112,7 @@ class PseudoUser:
@login_required
@permission_required("mumbletemps.create_new_links")
@permission_required("mumble.create_new_links")
def index(request):
tl = None
@ -118,11 +120,10 @@ def index(request):
duration = request.POST.get("time")
if duration in ["3", "6", "12", "24"]:
expiry = datetime.now().replace(tzinfo=timezone.utc) + timedelta(hours=int(duration))
tl = TempLink.objects.create(
creator=request.user.profile.main_character,
link_ref=get_random_string(15),
expires=expiry.timestamp(),
expires=datetime.now(timezone.utc) + timedelta(hours=int(duration))
)
tl.save()
@ -137,7 +138,7 @@ def index(request):
}
return render(
request=request, template_name="mumbletemps/index.html", context=context
request=request, template_name="services/mumble/index.html", context=context
)
@ -170,7 +171,7 @@ def link(request, link_ref):
context = {"link": templink}
return render(
request=request, template_name="mumbletemps/login.html", context=context
request=request, template_name="services/mumble/login.html", context=context
)
@ -204,7 +205,7 @@ def link_username(request, name, association, link):
}
return render(
request=request, template_name="mumbletemps/link.html", context=context
request=request, template_name="services/mumble/link.html", context=context
)
@ -246,12 +247,12 @@ def link_sso(request, token, link):
}
return render(
request=request, template_name="mumbletemps/link.html", context=context
request=request, template_name="services/mumble/link.html", context=context
)
@login_required
@permission_required("mumbletemps.create_new_links")
@permission_required("mumble.create_new_links")
def nuke(request, link_ref):
try:
TempLink.objects.get(link_ref=link_ref).delete()
@ -262,4 +263,4 @@ def nuke(request, link_ref):
messages.error(request=request, message=f"Deleted Token {link_ref}")
pass # Crappy link
return redirect(to="mumbletemps:index")
return redirect(to="mumble:index")