mirror/netbox-community-netbox
1
0
Fork 0
mirror of https://github.com/netbox-community/netbox.git synced 2024-05-10 07:54:54 +00:00
Code Activity

Merge branch 'develop' of github.com:digitalocean/netbox into select2-ui

Browse Source
This commit is contained in:
John Anderson
2019-01-04 12:44:41 -05:00
parent 7a5a73ce34 170e01b549
commit fca97f9768
17 changed files with 160 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
netbox/utilities/forms.py
View File

@ -558,8 +558,9 @@ class FilterChoiceIterator(forms.models.ModelChoiceIterator):
class FilterChoiceFieldMixin(object):
iterator = FilterChoiceIterator
def __init__(self, null_label=None, *args, **kwargs):
def __init__(self, null_label=None, count_attr='filter_count', *args, **kwargs):
self.null_label = null_label
self.count_attr = count_attr
if 'required' not in kwargs:
kwargs['required'] = False
if 'widget' not in kwargs:
@ -568,8 +569,9 @@ class FilterChoiceFieldMixin(object):
def label_from_instance(self, obj):
label = super().label_from_instance(obj)
if hasattr(obj, 'filter_count'):
return '{} ({})'.format(label, obj.filter_count)
obj_count = getattr(obj, self.count_attr, None)
if obj_count is not None:
return '{} ({})'.format(label, obj_count)
return label