updated filters and relations (#10)

Author: MathyouMB

resources/admin.py

@@ -11,10 +11,11 @@
 @admin.register(Resource)
 class CustomerResource(admin.ModelAdmin):
     list_display = ("title", "found_date", "status", "order", "resource_page_section")
-
+    list_filter =("resource_page_section", "status")
 @admin.register(ResourcePage)
 class CustomerResourcePage(admin.ModelAdmin):
     list_display = ["title"]
 @admin.register(ResourcePageSection)
 class CustomerResourceSection(admin.ModelAdmin):
     list_display = ("title", "resource_page", "order", "status")
+    list_filter =("resource_page", "status")

resources/migrations/0014_resourcepagesection_url.py

@@ -0,0 +1,18 @@
+# Generated by Django 3.1.4 on 2021-02-20 09:31
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('resources', '0013_resourcepagesection_status'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='resourcepagesection',
+            name='url',
+            field=models.TextField(blank=True, null=True),
+        ),
+    ]

resources/models.py

@@ -20,14 +20,16 @@ class ResourcePage(models.Model):
     description = models.TextField(null=True, blank=True)
 
     def public_sections(self):
-        return ResourcePageSection.objects.filter(status='p').order_by('order')
+        return self.resource_page_sections.filter(status='p').order_by('order')
+        
 
     def __str__(self): 
         return self.title 
 
 class ResourcePageSection(models.Model):
     title = models.CharField(max_length=75)
     description = models.TextField(null=True, blank=True)
+    url = models.TextField(null=True, blank=True)
     order = models.DecimalField(max_digits=10, decimal_places=2, default=0.0)
     status = models.CharField(choices=(
             ('p', "public"),
@@ -38,7 +40,7 @@ class ResourcePageSection(models.Model):
     resource_page = models.ForeignKey(ResourcePage, related_name='resource_page_sections', on_delete=models.CASCADE, blank=True, null=True)
 
     def public_resources(self):
-        return Resource.objects.filter(status='p').order_by('order')
+        return self.resources.filter(status='p').order_by('order')
 
     def __str__(self): 
         return self.title