Merge branch 'master' into feature/enhancement-editorial-standalop2

This commit is contained in:
Jakub Jezek 2020-08-07 16:33:01 +02:00
commit 68f72aa4a9
No known key found for this signature in database
GPG key ID: C4B96E101D2A47F3

View file

@ -70,7 +70,7 @@ def get_avalon_attr(session, split_hierarchical=True):
cust_attrs_query = (
"select id, entity_type, object_type_id, is_hierarchical, default"
" from CustomAttributeConfiguration"
" where group.name = \"avalon\""
" where group.name in (\"avalon\", \"pype\")"
)
all_avalon_attr = session.query(cust_attrs_query).all()
for cust_attr in all_avalon_attr: