summaryrefslogtreecommitdiff
path: root/app/pages
diff options
context:
space:
mode:
Diffstat (limited to 'app/pages')
-rw-r--r--app/pages/admin.py2
-rw-r--r--app/pages/migrations/0002_auto_20211030_1634.py44
-rw-r--r--app/pages/models.py7
-rw-r--r--app/pages/views.py2
4 files changed, 49 insertions, 6 deletions
diff --git a/app/pages/admin.py b/app/pages/admin.py
index 3c7d900..9ce93dc 100644
--- a/app/pages/admin.py
+++ b/app/pages/admin.py
@@ -46,7 +46,7 @@ class PageAdmin(admin.ModelAdmin):
@admin.register(HomePage)
class HomePageAdmin(admin.ModelAdmin):
form = LGEntryForm
- filter_horizontal = ('popular',)
+ #filter_horizontal = ('popular',)
class Media:
js = ('image-loader.js', 'next-prev-links.js')
diff --git a/app/pages/migrations/0002_auto_20211030_1634.py b/app/pages/migrations/0002_auto_20211030_1634.py
new file mode 100644
index 0000000..7a8649b
--- /dev/null
+++ b/app/pages/migrations/0002_auto_20211030_1634.py
@@ -0,0 +1,44 @@
+# Generated by Django 3.2.8 on 2021-10-30 16:34
+
+from django.db import migrations, models
+import django.db.models.deletion
+
+
+class Migration(migrations.Migration):
+
+ dependencies = [
+ ('posts', '0002_alter_post_id'),
+ ('media', '0002_auto_20211030_1634'),
+ ('pages', '0001_initial'),
+ ]
+
+ operations = [
+ migrations.RemoveField(
+ model_name='homepage',
+ name='image_offset_vertical',
+ ),
+ migrations.RemoveField(
+ model_name='homepage',
+ name='popular',
+ ),
+ migrations.AlterField(
+ model_name='homepage',
+ name='featured',
+ field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, related_name='banner', to='posts.post'),
+ ),
+ migrations.AlterField(
+ model_name='homepage',
+ name='featured_image',
+ field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, to='media.luximage'),
+ ),
+ migrations.AlterField(
+ model_name='homepage',
+ name='id',
+ field=models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID'),
+ ),
+ migrations.AlterField(
+ model_name='page',
+ name='id',
+ field=models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID'),
+ ),
+ ]
diff --git a/app/pages/models.py b/app/pages/models.py
index 7cf90ba..862a35c 100644
--- a/app/pages/models.py
+++ b/app/pages/models.py
@@ -44,11 +44,10 @@ class HomePage(models.Model):
simple model to control the featured article on the homepage
also allows me to fudge the "popular" section to be what I want
"""
- image_offset_vertical = models.CharField(max_length=20, help_text="add negative top margin to shift image (include css unit)")
- featured_image = models.ForeignKey(LuxImage, on_delete=models.CASCADE)
+ featured_image = models.ForeignKey(LuxImage, on_delete=models.CASCADE, null=True, blank=True)
tag_line = models.CharField(max_length=200, null=True, blank=True)
- featured = models.ForeignKey(Post, on_delete=models.CASCADE, related_name="banner")
- popular = models.ManyToManyField(Post, related_name="popular")
+ featured = models.ForeignKey(Post, on_delete=models.CASCADE, related_name="banner", null=True, blank=True)
+ #popular = models.ManyToManyField(Post, related_name="popular")
template_name = models.CharField(max_length=200, help_text="full path", null=True, blank=True)
diff --git a/app/pages/views.py b/app/pages/views.py
index cb91f9b..d876a49 100644
--- a/app/pages/views.py
+++ b/app/pages/views.py
@@ -34,7 +34,7 @@ class HomePageList(DetailView):
def get_context_data(self, **kwargs):
# Call the base implementation first to get a context
context = super(HomePageList, self).get_context_data(**kwargs)
- context['object_list'] = Post.objects.filter(post_type=PostType.JRNL).filter(status__exact=1).order_by('-pub_date').exclude().select_related('location').select_related('featured_image')[1:9]
+ #context['object_list'] = Post.objects.filter(post_type=PostType.JRNL).filter(status__exact=1).order_by('-pub_date').exclude().select_related('location').select_related('featured_image')[1:9]
return context