mirror of
https://github.com/retspen/webvirtcloud
synced 2026-11-11 12:46:49 +00:00
fix(accounts): a user's page reads only that user's VMs
The administrator's view of a user loaded every VM in the panel and never used them; the user's own VMs are now read in one query.
This commit is contained in:
parent
addff12652
commit
d80ec72fe0
1 changed files with 1 additions and 4 deletions
|
|
@ -21,7 +21,6 @@ from django.views.decorators.cache import never_cache
|
||||||
from django.views.decorators.http import require_POST
|
from django.views.decorators.http import require_POST
|
||||||
|
|
||||||
from accounts.apps import admin_password_path
|
from accounts.apps import admin_password_path
|
||||||
from instances.models import Instance
|
|
||||||
from logs.audit import audit, audit_vm, changed_fields, failed, snapshot
|
from logs.audit import audit, audit_vm, changed_fields, failed, snapshot
|
||||||
|
|
||||||
from accounts.forms import ApiTokenForm, EmailOTPForm, ProfileForm, UserSSHKeyForm
|
from accounts.forms import ApiTokenForm, EmailOTPForm, ProfileForm, UserSSHKeyForm
|
||||||
|
|
@ -147,8 +146,7 @@ def ssh_key_delete(request, pk):
|
||||||
@superuser_only
|
@superuser_only
|
||||||
def account(request, user_id):
|
def account(request, user_id):
|
||||||
user = get_object_or_404(User, id=user_id)
|
user = get_object_or_404(User, id=user_id)
|
||||||
user_insts = UserInstance.objects.filter(user_id=user_id)
|
user_insts = UserInstance.objects.filter(user_id=user_id).select_related("instance")
|
||||||
instances = Instance.objects.all().order_by("name")
|
|
||||||
publickeys = UserSSHKey.objects.filter(user_id=user_id)
|
publickeys = UserSSHKey.objects.filter(user_id=user_id)
|
||||||
|
|
||||||
return render(
|
return render(
|
||||||
|
|
@ -157,7 +155,6 @@ def account(request, user_id):
|
||||||
{
|
{
|
||||||
"user": user,
|
"user": user,
|
||||||
"user_insts": user_insts,
|
"user_insts": user_insts,
|
||||||
"instances": instances,
|
|
||||||
"publickeys": publickeys,
|
"publickeys": publickeys,
|
||||||
"api_tokens": ApiToken.objects.filter(user_id=user_id),
|
"api_tokens": ApiToken.objects.filter(user_id=user_id),
|
||||||
"otp_enabled": settings.OTP_ENABLED,
|
"otp_enabled": settings.OTP_ENABLED,
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue