Merge branch 'develop' of github.com:ungleich/dynamicweb into develop

This commit is contained in:
Henry Bravo 2017-06-11 19:46:26 -05:00
commit 38970e9353
3 changed files with 10 additions and 3 deletions

View file

@ -369,7 +369,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)