Let domain.check_if_valid() save itself

salt_observer/admin.py

@@ -20,13 +20,14 @@ class NetworkInterfaceInline(admin.TabularInline):
 class MinionAdmin(admin.ModelAdmin):
     inlines = [NetworkInterfaceInline]
     readonly_fields = ('fqdn', 'data', 'last_updated')
-    exclude = ('_data',)
+    exclude = ('_data', 'md_content')
 admin.site.register(Minion, MinionAdmin)
 
 
 class NetworkAdmin(admin.ModelAdmin):
     inlines = [NetworkInterfaceInline]
     readonly_fields = ('ipv4', 'mask', 'last_updated')
+    exclude = ('md_content',)
 admin.site.register(Network, NetworkAdmin)
 
 
@@ -34,5 +35,5 @@ class DomainAdmin(admin.ModelAdmin):
     list_display = ('fqdn', 'minion_count', 'valid', 'public', 'can_speak_https')
     filter_horizontal = ('minion',)
     readonly_fields = ('ssl_lab_status',)
-    exclude = ('_ssl_lab_status',)
+    exclude = ('_ssl_lab_status', 'md_content')
 admin.site.register(Domain, DomainAdmin)

salt_observer/migrations/0015_auto_20160718_1812.py

+# -*- coding: utf-8 -*-
+# Generated by Django 1.9.4 on 2016-07-18 16:12
+from __future__ import unicode_literals
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('salt_observer', '0014_domain_md_content'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='domain',
+            name='md_content',
+            field=models.TextField(blank=True),
+        ),
+        migrations.AlterField(
+            model_name='minion',
+            name='md_content',
+            field=models.TextField(blank=True),
+        ),
+        migrations.AlterField(
+            model_name='network',
+            name='md_content',
+            field=models.TextField(blank=True),
+        ),
+    ]

salt_observer/models.py

@@ -7,7 +7,7 @@ import requests
 class MarkdownContent(models.Model):
     ''' To enable on-the-fly modification of templates '''
 
-    md_content = models.TextField()
+    md_content = models.TextField(blank=True)
 
     class Meta:
         abstract = True
@@ -47,7 +47,7 @@ class Domain(MarkdownContent):
     def ssl_lab_status(self, value):
         self._ssl_lab_status = json.dumps(value)
 
-    def check_if_valid(self):
+    def check_if_valid(self, commit=True):
         try:
             a = requests.get('http://{}/'.format(self.fqdn), timeout=5, verify=False)
             b = requests.get('https://{}/'.format(self.fqdn), timeout=5, verify=False)
@@ -56,12 +56,15 @@ class Domain(MarkdownContent):
         else:
             self.valid = True
 
+        if commit:
+            self.save()
+
     def minion_count(self):
         return len(self.minion.all())
 
     def save(self, *args, **kwargs):
         if not self.id:
-            self.check_if_valid()
+            self.check_if_valid(commit=False)
         super().save(*args, **kwargs)
 
     def __str__(self):