From: Scott Baker <smbaker@gmail.com>
Date: Tue, 7 Oct 2014 06:09:59 +0000 (-0700)
Subject: fix TypeError in SliceForm:clean
X-Git-Url: http://git.onelab.eu/?p=plstackapi.git;a=commitdiff_plain;h=3fc1fd85b57336a78ee88b131543e378962949ce

fix TypeError in SliceForm:clean
---

diff --git a/planetstack/core/admin.py b/planetstack/core/admin.py
index a2c76e2..d2a9b53 100644
--- 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')
-        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