commit 3cb382c71dde5deddad5b41193dd8c5ee9c926bc
author Scott Baker <smbaker@gmail.com> Mon Oct 06 23:09:59 2014 -0700
committer Scott Baker <smbaker@gmail.com> Mon Oct 06 23:09:59 2014 -0700
tree 0c8290df449537e8c9a68aad6bd5473b233ea2a7
parent 1bffe9444cfb5eb07fd69469ada59927ec083d58

fix TypeError in SliceForm:clean

planetstack/core/admin.py

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 @@
     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