From bd1628bbda01160b985ffee6dbd5b982985039e4 Mon Sep 17 00:00:00 2001 From: Domagoj Zecevic Date: Sun, 28 Jan 2024 00:26:28 +0100 Subject: [PATCH] added show on page --- blog/admin.py | 6 ++--- blog/migrations/0007_post_show_on_page.py | 18 ++++++++++++++ ...st_show_on_page_sexy_posts_show_on_page.py | 23 ++++++++++++++++++ blog/models.py | 3 +++ blog/templates/blog/index.html | 6 ++++- blog/templates/blog/post_list.html | 11 ++++++--- blog/templates/blog/sexy_list.html | 11 ++++++--- db.sqlite3 | Bin 176128 -> 204800 bytes 8 files changed, 68 insertions(+), 10 deletions(-) create mode 100644 blog/migrations/0007_post_show_on_page.py create mode 100644 blog/migrations/0008_index_post_show_on_page_sexy_posts_show_on_page.py diff --git a/blog/admin.py b/blog/admin.py index bacd596..7852bb7 100644 --- a/blog/admin.py +++ b/blog/admin.py @@ -2,13 +2,13 @@ from django.contrib import admin from .models import Post, Index_Post, Sexy_Posts class PostAdmin(admin.ModelAdmin): - list_display = ('title', 'short_description', 'pub_date') + list_display = ('title', 'short_description', 'pub_date', 'show_on_page') class IndexPostAdmin(admin.ModelAdmin): - list_display = ('title', 'content', 'pub_date') + list_display = ('title', 'content', 'pub_date', 'show_on_page') class SexyPost(admin.ModelAdmin): - list_display = ('title', 'short_description', 'pub_date') + list_display = ('title', 'short_description', 'pub_date', 'show_on_page') admin.site.register(Post, PostAdmin) admin.site.register(Index_Post, IndexPostAdmin) diff --git a/blog/migrations/0007_post_show_on_page.py b/blog/migrations/0007_post_show_on_page.py new file mode 100644 index 0000000..6afcbde --- /dev/null +++ b/blog/migrations/0007_post_show_on_page.py @@ -0,0 +1,18 @@ +# Generated by Django 4.2.7 on 2024-01-27 23:18 + +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ('blog', '0006_sexy_posts'), + ] + + operations = [ + migrations.AddField( + model_name='post', + name='show_on_page', + field=models.BooleanField(default=False), + ), + ] diff --git a/blog/migrations/0008_index_post_show_on_page_sexy_posts_show_on_page.py b/blog/migrations/0008_index_post_show_on_page_sexy_posts_show_on_page.py new file mode 100644 index 0000000..5efab68 --- /dev/null +++ b/blog/migrations/0008_index_post_show_on_page_sexy_posts_show_on_page.py @@ -0,0 +1,23 @@ +# Generated by Django 4.2.7 on 2024-01-27 23:24 + +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ('blog', '0007_post_show_on_page'), + ] + + operations = [ + migrations.AddField( + model_name='index_post', + name='show_on_page', + field=models.BooleanField(default=False), + ), + migrations.AddField( + model_name='sexy_posts', + name='show_on_page', + field=models.BooleanField(default=False), + ), + ] diff --git a/blog/models.py b/blog/models.py index b45d699..20f8ac9 100644 --- a/blog/models.py +++ b/blog/models.py @@ -5,6 +5,7 @@ class Post(models.Model): content = models.TextField() short_description = models.TextField(max_length=300, blank=True, null=True) pub_date = models.DateTimeField('date published') + show_on_page = models.BooleanField(default=False) def __str__(self): return self.title @@ -13,6 +14,7 @@ class Index_Post(models.Model): title = models.CharField(max_length=200) content = models.TextField() pub_date = models.DateTimeField('date published') + show_on_page = models.BooleanField(default=False) def __str__(self): return self.title @@ -22,6 +24,7 @@ class Sexy_Posts(models.Model): content = models.TextField() short_description = models.TextField(max_length=300, blank=True, null=True) pub_date = models.DateTimeField('date published') + show_on_page = models.BooleanField(default=False) def __str__(self): return self.title \ No newline at end of file diff --git a/blog/templates/blog/index.html b/blog/templates/blog/index.html index bc13721..3977b67 100644 --- a/blog/templates/blog/index.html +++ b/blog/templates/blog/index.html @@ -85,11 +85,15 @@

+ {% if post.show_on_page %} {{ post.title }} + {% endif %}

- {{ post.content|linebreaksbr }} + {% if post.show_on_page %} + {{ post.content|linebreaksbr }} + {% endif %}

diff --git a/blog/templates/blog/post_list.html b/blog/templates/blog/post_list.html index 7f465bf..f283275 100644 --- a/blog/templates/blog/post_list.html +++ b/blog/templates/blog/post_list.html @@ -85,14 +85,19 @@

+ {% if post.show_on_page %} as {{ post.title }} + {% endif %}

- {{ post.short_description|linebreaksbr }} + {% if post.show_on_page %} + {{ post.short_description|linebreaksbr }} + {% endif %}

- - Read More + {% if post.show_on_page %} + Read More + {% endif %}
diff --git a/blog/templates/blog/sexy_list.html b/blog/templates/blog/sexy_list.html index 380233c..e4d6a7a 100644 --- a/blog/templates/blog/sexy_list.html +++ b/blog/templates/blog/sexy_list.html @@ -85,14 +85,19 @@

+ {% if post.show_on_page %} {{ post.title }} + {% endif %}

- {{ post.short_description|linebreaksbr }} + {% if post.show_on_page %} + {{ post.short_description|linebreaksbr }} + {% endif %}

- - Read More + {% if post.show_on_page %} + Read More + {% endif %}
diff --git a/db.sqlite3 b/db.sqlite3 index 02f38a13c93197a7b39d4e2c7c5d933750fa45fd..7af2f501140a3cf6ab4c9a6e5f89fab05f95f340 100644 GIT binary patch delta 1593 zcma)6TWlLe6y4c%V(;3!*QU6U6Tq9e%{%r!?5u5}mJlAP6w;J73hD#fNv+gX>@{&x zLPcpd?N_Bhj6YVWKSV`>O5w4!R0|=sMI@>ONTm{}s?>M^VsFXUTg)Mdoq1FD)93s$FSp-<4Fq200_ z?XRvN++!UB!|ISA2;o>Nvp+c=%c{B2Snh!OYD~?VB^R?#>#rjvef-RD~6-8;#UMEq=bs|p1w*FaD{HLzz0Mi z-?7oX!AZ3sv(6Q@P=$EFja-F80R?e|j{=Pd3Rf^!PYP!RR3VT^(XDaxxQ&fEy6lR* zQE!c-W()Hp@qJ!fC@Bf_32osbL~mZ}W+pksTGi5mj_uStGsuVP^q~xzYii}|R-Qy1 zKcK3^e9!h>d{19@cax^JFRR>oyNXq{`fe4ys4vBF>bW@b*8ivY^^mp7>qW<&*W+-h%_hAN3 z8rmz+TtOj3yUOe=GnAP#*~Xe|b(Gnz&wq@zV(VD~?!aI02i$<4u=yffg>T^!e2I-O zz-Mq4445stvXkJmP&9IxBr1Xi$H5 z0W}35nkE#LMSn;ME5Y_X+*o5K3XvS#4Xu?0n5}?MCWtzO>ExIOdt`hEW zRNx>4w=olvk$n^L)B7t$60iIvOD~pK@TX8Zy@ljaX_Jfm;fcyq1bmH78JdpRYt^^| zpH{4qj}Ou%LnLcBrcJ`NdN<1(Z2EUwNzrnbAnzL5pX4J~M=6@{n87~!{z#Osp{tWD HIZ)tl{Ry*+ delta 602 zcmXw#Ur5tY6vywmcW!R`?RS(V+gP^QPfOikTfc?~!3ZMkrO49gC8st_oNcsW`4V3B zDJYaZTzpS3g5}RaKYG%@;X{N7g$NeaUh1JgMA3udx-&X(4(A*`=X(xkYE7B?;F$9_ zCI}%R>HqEAd{~Esk$jBIYcCgU4Kag1w3o`hKC8iF*yMJx5DcX=BLlhAy~%-WCYR6A zLNd|>j>1Hw3!H^wq#cyPwv68C=<_JlMJeeQwj?yylYR`V-Gqp65;~9a8>eiZKmcZ( z`N5%d>QJ<%S4%`T4L*?>ho{hCb`8R^-9iZKHTXs5;MvnQPbdU49&vUIH0ThiF<5tY z@XPvPfBL%UP0N0}m`FpfSQ>{bX7v(4!^#g!(Cff5!9Dzq-|-7p@EvaB7QVuAsWJNm zMfn*dB(h0xAOGM_{ED9?^d5Kc4Q@)Lgy!Zd#2dU0rAqK6CNZE^)CcMXRdos1HKl6s ziegrG0W_sf{uFSp_SrTg`v~XfZdzNZtTb~;WkE1oKhjUftcwI+!=k|#K-u+CJJEQ_ zug?yf%fS4q{X`6`B+#b2#am=C%K@PW2LDAHcXF(r_-d$@Pv!DKU2IL#ZnMYDOr`F) zTyoO1tkL~|!zFWIal+yT53wT)JyK6w>C?}T-jQQhZ;jp_`8Rr((ff*0!>OxCaMe{b u_%|nI8wOtiWu3~?TKIHkc33xGG*b(;cP6A%OGMMfMu47ykZDQEg?|Ai{jZh)