git://git.onelab.eu
/
plstackapi.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (from parent 1:
6f0e353
)
update OSModleAdmin
author
Tony Mack
<tmack@paris.CS.Princeton.EDU>
Sun, 5 May 2013 15:48:14 +0000
(11:48 -0400)
committer
Tony Mack
<tmack@paris.CS.Princeton.EDU>
Sun, 5 May 2013 15:48:14 +0000
(11:48 -0400)
plstackapi/core/admin.py
patch
|
blob
|
history
diff --git
a/plstackapi/core/admin.py
b/plstackapi/core/admin.py
index
1f0744a
..
dfb4e0d
100644
(file)
--- 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):
"""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):
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):
obj.delete()
class RoleAdmin(OSModelAdmin):