From fe402331f29e2b8cb9f84293f88e2d085ace20a4 Mon Sep 17 00:00:00 2001
From: Jeremy Stretch <stretch@packetlife.net>
Date: Thu, 23 Jan 2020 16:16:52 -0500
Subject: [PATCH] Handle grouped choices when returning ChoiceSet values

---
 netbox/utilities/choices.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/netbox/utilities/choices.py b/netbox/utilities/choices.py
index 6e6afe3e2..19082dbb6 100644
--- a/netbox/utilities/choices.py
+++ b/netbox/utilities/choices.py
@@ -18,7 +18,7 @@ class ChoiceSet(metaclass=ChoiceSetMeta):
 
     @classmethod
     def values(cls):
-        return [c[0] for c in cls.CHOICES]
+        return [c[0] for c in unpack_grouped_choices(cls.CHOICES)]
 
     @classmethod
     def as_dict(cls):