Просмотр исходного кода

Remove example choices from CSV import form

Jeremy Stretch 5 лет назад
Родитель
Сommit
d85d963842

+ 1 - 3
netbox/templates/utilities/obj_bulk_import.html

@@ -71,9 +71,7 @@
                                             {% elif field.label %}
                                                 {{ field.label }}<br />
                                             {% endif %}
-                                            {% if field.choices %}
-                                                <small class="text-muted">Choices: {{ field|example_choices }}</small>
-                                            {% elif field|widget_type == 'dateinput' %}
+                                            {% if field|widget_type == 'dateinput' %}
                                                 <small class="text-muted">Format: YYYY-MM-DD</small>
                                             {% elif field|widget_type == 'checkboxinput' %}
                                                 <small class="text-muted">Specify "true" or "false"</small>

+ 0 - 22
netbox/utilities/templatetags/helpers.py

@@ -116,28 +116,6 @@ def humanize_speed(speed):
         return '{} Kbps'.format(speed)
 
 
-@register.filter()
-def example_choices(field, arg=3):
-    """
-    Returns a number (default: 3) of example choices for a ChoiceFiled (useful for CSV import forms).
-    """
-    examples = []
-    if hasattr(field, 'queryset'):
-        choices = [
-            (obj.pk, getattr(obj, field.to_field_name)) for obj in field.queryset[:arg + 1]
-        ]
-    else:
-        choices = field.choices
-    for value, label in unpack_grouped_choices(choices):
-        if len(examples) == arg:
-            examples.append('etc.')
-            break
-        if not value or not label:
-            continue
-        examples.append(label)
-    return ', '.join(examples) or 'None'
-
-
 @register.filter()
 def tzoffset(value):
     """