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 (parent:
e3c1443
)
fix TypeError in SliceForm:clean
author
Scott Baker
<smbaker@gmail.com>
Tue, 7 Oct 2014 06:09:59 +0000
(23:09 -0700)
committer
Scott Baker
<smbaker@gmail.com>
Tue, 7 Oct 2014 06:09:59 +0000
(23:09 -0700)
planetstack/core/admin.py
patch
|
blob
|
history
diff --git
a/planetstack/core/admin.py
b/planetstack/core/admin.py
index
a2c76e2
..
d2a9b53
100644
(file)
--- a/
planetstack/core/admin.py
+++ b/
planetstack/core/admin.py
@@
-727,8
+727,10
@@
class SliceForm(forms.ModelForm):
def clean(self):
cleaned_data = super(SliceForm, self).clean()
name = cleaned_data.get('name')
def clean(self):
cleaned_data = super(SliceForm, self).clean()
name = cleaned_data.get('name')
- site_id = cleaned_data.get('site')
- site = Slice.objects.get(id=site_id)
+ site = cleaned_data.get('site')
+ if (not isinstance(site,Site)):
+ # previous code indicates 'site' could be a site_id and not a site?
+ site = Slice.objects.get(id=site.id)
if not name.startswith(site.login_base):
raise forms.ValidationError('slice name must begin with %s' % site.login_base)
return cleaned_data
if not name.startswith(site.login_base):
raise forms.ValidationError('slice name must begin with %s' % site.login_base)
return cleaned_data