Introduce is_taggable utility function for identifying taggable models

This commit is contained in:
Jeremy Stretch
2019-12-11 15:26:47 -05:00
parent 8b189abd58
commit ce4a5a38a3
4 changed files with 22 additions and 4 deletions

View File

@@ -6,6 +6,7 @@ from django.core.serializers import serialize
from django.db.models import Count, OuterRef, Subquery
from dcim.choices import CableLengthUnitChoices
from extras.utils import is_taggable
def csv_format(data):
@@ -103,7 +104,7 @@ def serialize_object(obj, extra=None):
}
# Include any tags
if hasattr(obj, 'tags'):
if is_taggable(obj):
data['tags'] = [tag.name for tag in obj.tags.all()]
# Append any extra data
@@ -201,7 +202,7 @@ def prepare_cloned_fields(instance):
params[field_name] = field_value
# Copy tags
if hasattr(instance, 'tags'):
if is_taggable(instance):
params['tags'] = ','.join([t.name for t in instance.tags.all()])
# Concatenate parameters into a URL query string

View File

@@ -24,6 +24,7 @@ from django_tables2 import RequestConfig
from extras.models import CustomField, CustomFieldValue, ExportTemplate
from extras.querysets import CustomFieldQueryset
from extras.utils import is_taggable
from utilities.exceptions import AbortTransaction
from utilities.forms import BootstrapMixin, CSVDataField
from utilities.utils import csv_format, prepare_cloned_fields
@@ -144,7 +145,7 @@ class ObjectListView(View):
table.columns.show('pk')
# Construct queryset for tags list
if hasattr(model, 'tags') and type(model.tags).__name__ is not 'ManyToManyDescriptor':
if is_taggable(model):
tags = model.tags.annotate(count=Count('extras_taggeditem_items')).order_by('name')
else:
tags = None