mravi/dynamicweb
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Merge branch 'master' into bug/3313/pwd_reset_email_from_dcl_support

Browse source
This commit is contained in:
Levi Velázquez 2017-06-15 01:17:14 -05:00 • committed by GitHub
commit 657e93862d
99 changed files with 1282 additions and 1811 deletions
Download patch file Download diff file Expand all files Collapse all files

4
hosting/views.py
View file

@ -299,7 +299,7 @@ class SSHKeyDeleteView(LoginRequiredMixin, DeleteView):
manager = OpenNebulaManager()
pk = self.kwargs.get('pk')
# Get user ssh key
public_key = UserHostingKey.objects.get(pk=pk)
public_key = UserHostingKey.objects.get(pk=pk).public_key
# Add ssh key to user
try:
manager.remove_public_key(user=owner, public_key=public_key)
@ -370,7 +370,7 @@ class SSHKeyCreateView(LoginRequiredMixin, FormView):
manager = OpenNebulaManager()
# Get user ssh key
public_key = form.cleaned_data.get('public_key')
public_key = form.cleaned_data.get('public_key', '').decode('utf-8')
# Add ssh key to user
try:
manager.add_public_key(user=owner, public_key=public_key, merge=True)