Merge branch 'develop' into develop-2.3

2018-02-06 14:58:11 -05:00
parent 11fe54753e 594ef71027
commit 73c64272d8
62 changed files with 571 additions and 515 deletions
--- a/netbox/circuits/forms.py
+++ b/netbox/circuits/forms.py
@@ -44,7 +44,7 @@ class ProviderCSVForm(forms.ModelForm):

    class Meta:
        model = Provider
-        fields = ['name', 'slug', 'asn', 'account', 'portal_url', 'comments']
+        fields = Provider.csv_headers
        help_texts = {
            'name': 'Provider name',
            'asn': '32-bit autonomous system number',
@@ -90,7 +90,7 @@ class CircuitTypeCSVForm(forms.ModelForm):

    class Meta:
        model = CircuitType
-        fields = ['name', 'slug']
+        fields = CircuitType.csv_headers
        help_texts = {
            'name': 'Name of circuit type',
        }