From 5f05f6e7660ebc332735d4aa5e627daf0c419838 Mon Sep 17 00:00:00 2001
From: vermeul <swen@ethz.ch>
Date: Tue, 12 Mar 2019 12:14:26 +0100
Subject: [PATCH] get_propertyAssignments may now return vocabulary

---
 pybis/src/python/pybis/entity_types.py | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/pybis/src/python/pybis/entity_types.py b/pybis/src/python/pybis/entity_types.py
index aa6207615ec..f301e3c0530 100644
--- a/pybis/src/python/pybis/entity_types.py
+++ b/pybis/src/python/pybis/entity_types.py
@@ -38,8 +38,10 @@ class EntityType():
     def __ne__(self, other):
         return str(self) != str(other)
 
-    def get_propertyAssignments(self):
+    def get_propertyAssignments(self, including_vocabulary=False):
         attrs = ['code', 'label', 'description', 'dataType', 'mandatory', 'showInEditView', 'ordinal']
+        if including_vocabulary:
+            attrs.append('vocabulary')
         pas = [ {**pa['propertyType'], **pa} for pa in self.data['propertyAssignments'] ]
         return DataFrame(pas, columns=attrs)
 
-- 
GitLab