From: Tony Mack Date: Sun, 5 May 2013 15:48:14 +0000 (-0400) Subject: update OSModleAdmin X-Git-Tag: 1.0~61^2~34 X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=38e247c0495c3f1e2eca899c13f89fcee3dbf8a5;hp=6f0e3539e8a84130b7f24163ee222f96a5490d72;p=plstackapi.git update OSModleAdmin --- diff --git a/plstackapi/core/admin.py b/plstackapi/core/admin.py index 1f0744a..dfb4e0d 100644 --- a/plstackapi/core/admin.py +++ b/plstackapi/core/admin.py @@ -68,15 +68,17 @@ class OSModelAdmin(PlanetStackBaseAdmin): """Attach client connection to openstack on delete() and save()""" def save_model(self, request, obj, form, change): - auth = request.session.get('auth', {}) - auth['tenant'] = request.user.site.login_base - obj.os_manager = OpenStackManager(auth=auth, caller=request.user) + if request.user.site: + auth = request.session.get('auth', {}) + auth['tenant'] = request.user.site.login_base + obj.os_manager = OpenStackManager(auth=auth, caller=request.user) obj.save() def delete_model(self, request, obj): - auth = request.session.get('auth', {}) - auth['tenant'] = request.user.site.login_base - obj.os_manager = OpenStackManager(auth=auth, caller=request.user) + if request.user.site: + auth = request.session.get('auth', {}) + auth['tenant'] = request.user.site.login_base + obj.os_manager = OpenStackManager(auth=auth, caller=request.user) obj.delete() class RoleAdmin(OSModelAdmin):