External-Mirrors/awx
2
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2026-05-21 15:57:52 -02:30
Code Issues Packages Projects Releases Wiki Activity

Include defined fields from all parent classes of a HybridDictField

Browse Source 
since our settings registry adds a mixin class when doing validation on these.

related #4099
This commit is contained in:
Jeff Bradberry
2019-06-18 16:10:38 -04:00
parent 7faff07bd9
commit 758ad164fe
2 changed files with 34 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
awx/sso/fields.py
View File

@@ -93,12 +93,14 @@ class HybridDictField(fields.DictField):
self.allow_blank = kwargs.pop('allow_blank', False)
fields = [
(field_name, obj)
for field_name, obj in self.__class__.__dict__.items()
if isinstance(obj, Field) and field_name != 'child'
sorted(
((field_name, obj) for field_name, obj in cls.__dict__.items()
if isinstance(obj, Field) and field_name != 'child'),
key=lambda x: x[1]._creation_counter
)
for cls in reversed(self.__class__.__mro__)
]
fields.sort(key=lambda x: x[1]._creation_counter)
self._declared_fields = collections.OrderedDict(fields)
self._declared_fields = collections.OrderedDict(f for group in fields for f in group)
super().__init__(*args, **kwargs)