Bläddra i källkod

Webhook admin form cleanup

Jeremy Stretch 7 år sedan
förälder
incheckning
ea09023616
3 ändrade filer med 9 tillägg och 6 borttagningar
  1. 3 2
      netbox/extras/admin.py
  2. 2 2
      netbox/extras/migrations/0012_webhooks.py
  3. 4 2
      netbox/extras/models.py

+ 3 - 2
netbox/extras/admin.py

@@ -25,8 +25,9 @@ def order_content_types(field):
 #
 
 class WebhookForm(forms.ModelForm):
-
-    payload_url = LaxURLField()
+    payload_url = LaxURLField(
+        label='URL'
+    )
 
     class Meta:
         model = Webhook

+ 2 - 2
netbox/extras/migrations/0012_webhooks.py

@@ -22,10 +22,10 @@ class Migration(migrations.Migration):
                 ('type_update', models.BooleanField(default=False, help_text='Call this webhook when a matching object is updated.')),
                 ('type_delete', models.BooleanField(default=False, help_text='Call this webhook when a matching object is deleted.')),
                 ('payload_url', models.CharField(help_text='A POST will be sent to this URL when the webhook is called.', max_length=500, verbose_name='URL')),
-                ('http_content_type', models.PositiveSmallIntegerField(choices=[(1, 'application/json'), (2, 'application/x-www-form-urlencoded')], default=1)),
+                ('http_content_type', models.PositiveSmallIntegerField(choices=[(1, 'application/json'), (2, 'application/x-www-form-urlencoded')], default=1, verbose_name='HTTP content type')),
                 ('secret', models.CharField(blank=True, help_text="When provided, the request will include a 'X-Hook-Signature' header containing a HMAC hex digest of the payload body using the secret as the key. The secret is not transmitted in the request.", max_length=255)),
                 ('enabled', models.BooleanField(default=True)),
-                ('ssl_verification', models.BooleanField(default=True, help_text='Enable SSL certificate verification. Disable with caution!')),
+                ('ssl_verification', models.BooleanField(default=True, help_text='Enable SSL certificate verification. Disable with caution!', verbose_name='SSL verification')),
                 ('obj_type', models.ManyToManyField(help_text='The object(s) to which this Webhook applies.', related_name='webhooks', to='contenttypes.ContentType', verbose_name='Object types')),
             ],
         ),

+ 4 - 2
netbox/extras/models.py

@@ -65,7 +65,8 @@ class Webhook(models.Model):
     )
     http_content_type = models.PositiveSmallIntegerField(
         choices=WEBHOOK_CT_CHOICES,
-        default=WEBHOOK_CT_JSON
+        default=WEBHOOK_CT_JSON,
+        verbose_name='HTTP content type'
     )
     secret = models.CharField(
         max_length=255,
@@ -80,11 +81,12 @@ class Webhook(models.Model):
     )
     ssl_verification = models.BooleanField(
         default=True,
+        verbose_name='SSL verification',
         help_text="Enable SSL certificate verification. Disable with caution!"
     )
 
     class Meta:
-        unique_together = ('payload_url', 'type_create', "type_update", "type_delete",)
+        unique_together = ('payload_url', 'type_create', 'type_update', 'type_delete',)
 
     def __str__(self):
         return self.name