j3d1/webvirtcloud
1
0
Fork 0
mirror of https://github.com/retspen/webvirtcloud synced 2026-03-23 02:54:51 +00:00
Code Issues Projects Releases Wiki Activity

Merge 1204c6d1b4 into 85aac6fa0a

Browse source
This commit is contained in:
Bandic007 2018-07-06 11:27:24 +00:00 • committed by GitHub
commit 21760e8d05
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 7 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

9
accounts/urls.py
View file

@ -4,8 +4,11 @@ from django.contrib.auth import views as auth_views
from . import views from . import views
urlpatterns = [ urlpatterns = [
url(r'^login/$', auth_views.LoginView.as_view(template_name='login.html'), name='login'), url(r'^login/$', 'django.contrib.auth.views.login',
url(r'^logout/$', auth_views.LogoutView.as_view(template_name='logout.html'), name='logout'), {'template_name': 'login.html'}, name='login'),
url(r'^profile/$', views.profile, name='profile'), url(r'^$', views.accounts, name='accounts'), url(r'^logout/$', 'django.contrib.auth.views.logout',
{'template_name': 'logout.html'}, name='logout'),
url(r'^profile/$', views.profile, name='profile'),
url(r'^$', views.accounts, name='accounts'),
url(r'^profile/(?P<user_id>[0-9]+)/$', views.account, name='account'), url(r'^profile/(?P<user_id>[0-9]+)/$', views.account, name='account'),
] ]

2
instances/views.py
View file

@ -85,7 +85,7 @@ def instances(request):
comp_info["mem_size"], comp_info["mem_size"],
comp_info["mem_perc"]][vm]['userinstances'] = get_userinstances_info(check_uuid) comp_info["mem_perc"]][vm]['userinstances'] = get_userinstances_info(check_uuid)
except Instance.DoesNotExist: except Instance.DoesNotExist:
check_uuid = Instance(compute_id=comp.id, name=vm, uuid=info['uuid']) check_uuid = Instance(compute_id=comp["id"], name=vm, uuid=info['uuid'])
check_uuid.save() check_uuid.save()
if not request.user.is_superuser: if not request.user.is_superuser: