diff --git a/Changelog b/Changelog index f3e3d4d4..d48a5346 100644 --- a/Changelog +++ b/Changelog @@ -27,3 +27,7 @@ * [datacenterlight] Fix initially shown price 1.0.0: 2017-05-25 * Initial stable release + + Next: + [datacenterlight] Fixed error trying to delete ssh key + [datacenterlight] Fixed footer links diff --git a/hosting/views.py b/hosting/views.py index d99342e2..fc7796e1 100644 --- a/hosting/views.py +++ b/hosting/views.py @@ -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) diff --git a/opennebula_api/models.py b/opennebula_api/models.py index 4165e344..7330a7fe 100644 --- a/opennebula_api/models.py +++ b/opennebula_api/models.py @@ -449,6 +449,7 @@ class OpenNebulaManager(): """ # TODO: Check if we can remove this first try because we basically just # raise the possible Errors + try: open_user = self._get_user(user) try: @@ -492,14 +493,16 @@ class OpenNebulaManager(): try: old_key = open_user.template.ssh_public_key if public_key not in old_key: - raise KeyDoesNotExistsError() + return False + # raise KeyDoesNotExistsError() if '\n{}'.format(public_key) in old_key: public_key = old_key.replace('\n{}'.format(public_key), '') else: public_key = old_key.replace(public_key, '') except AttributeError: - raise KeyDoesNotExistsError() + return False + #raise KeyDoesNotExistsError() self.oneadmin_client.call('user.update', open_user.id, '{key}'.format(key=public_key))