2
0
Эх сурвалжийг харах

Moving robots.txt from wagtail settings to template (#139)

* Moving robots.txt from wagtail settings to template

* Merged migrations.
Vince Salvino 6 жил өмнө
parent
commit
66537c5857

+ 17 - 0
coderedcms/migrations/0010_remove_generalsettings_robots.py

@@ -0,0 +1,17 @@
+# Generated by Django 2.1.5 on 2019-03-20 02:59
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('coderedcms', '0009_auto_20190201_1546'),
+    ]
+
+    operations = [
+        migrations.RemoveField(
+            model_name='generalsettings',
+            name='robots',
+        ),
+    ]

+ 14 - 0
coderedcms/migrations/0011_merge_20190322_1309.py

@@ -0,0 +1,14 @@
+# Generated by Django 2.1.7 on 2019-03-22 17:09
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('coderedcms', '0010_remove_generalsettings_robots'),
+        ('coderedcms', '0010_generalsettings_email'),
+    ]
+
+    operations = [
+    ]

+ 1 - 22
coderedcms/models/wagtailsettings_models.py

@@ -267,18 +267,9 @@ class GeneralSettings(BaseSetting):
     Various site-wide settings. A good place to put
     one-off settings that don't belong anywhere else.
     """
-    default_robot = """User-agent: *
-Disallow: /admin/
-
-User-agent: *
-Disallow: /django-admin/
-
-User-agent: *
-Allow: /
-
-Sitemap: /sitemap.xml"""
 
     from_email_address = models.CharField(
+
         blank=True,
         max_length=255,
         verbose_name=_('From email address'),
@@ -288,12 +279,6 @@ Sitemap: /sitemap.xml"""
         default=10,
         verbose_name=_('Number of results per page'),
     )
-    robots = models.TextField(
-        blank=True,
-        default=default_robot,
-        verbose_name=_('robots.txt'),
-        help_text=_('Enter the contents of a robots.txt file.'),
-    )
 
     panels = [
         MultiFieldPanel(
@@ -308,12 +293,6 @@ Sitemap: /sitemap.xml"""
             ],
             _('Search Settings')
         ),
-        MultiFieldPanel(
-            [
-                FieldPanel('robots'),
-            ],
-            _('Robots.txt')
-        ),
     ]
 
     class Meta:

+ 10 - 1
coderedcms/templates/robots.txt

@@ -1 +1,10 @@
-{{robots}}
+User-agent: *
+Disallow: /admin/
+
+User-agent: *
+Disallow: /django-admin/
+
+User-agent: *
+Allow: /
+
+Sitemap: /sitemap.xml

+ 0 - 2
coderedcms/views.py

@@ -120,11 +120,9 @@ def serve_protected_file(request, path):
 
 
 def robots(request):
-    robots = GeneralSettings.for_site(request.site).robots
     return render(
         request,
         'robots.txt',
-        {'robots': robots},
         content_type='text/plain'
     )