commit 66aa5449acd4c74e3a77024fcbe2ecd5c398fe7b
author Scott Baker <smbaker@gmail.com> Wed Dec 09 16:50:40 2015 -0800
committer Scott Baker <smbaker@gmail.com> Wed Dec 09 16:50:40 2015 -0800
tree b776389a5c304c74ade84238e6db3460188be7c1
parent 55aa2652f7e6712f0871c53313d228ec44b17f5b

allow enforce_choices to treat empty string and none as the same

xos/core/models/plcorebase.py

diff --git a/xos/core/models/plcorebase.py b/xos/core/models/plcorebase.py
index 5878fff..360792f 100644
--- a/xos/core/models/plcorebase.py
+++ b/xos/core/models/plcorebase.py
@@ -137,6 +137,9 @@
         for choice in choices:
             if field==choice:
                 return
+            if (choice==None) and (field==""):
+                # allow "" and None to be equivalent
+                return
         raise Exception("Field value %s is not in %s" % (field, str(choices)))
 
 class PlCoreBase(models.Model, PlModelMixIn):