From 54022532ea4e0b6362688cd830e269553c246d9f Mon Sep 17 00:00:00 2001 From: Allecks Date: Wed, 5 Oct 2022 18:56:04 +0300 Subject: [PATCH] init --- samplesite/bboard/admin.py | 6 +- ...er_bb_options_alter_bb_content_and_more.py | 55 ++++++++++++++++++ samplesite/bboard/models.py | 14 +++++ samplesite/db.sqlite3 | Bin 139264 -> 151552 bytes 4 files changed, 73 insertions(+), 2 deletions(-) create mode 100644 samplesite/bboard/migrations/0002_rubric_alter_bb_options_alter_bb_content_and_more.py diff --git a/samplesite/bboard/admin.py b/samplesite/bboard/admin.py index cb9b948..f0673d6 100644 --- a/samplesite/bboard/admin.py +++ b/samplesite/bboard/admin.py @@ -1,10 +1,12 @@ from django.contrib import admin from .models import Bb +from .models import Rubric class BbAdmin(admin.ModelAdmin): - list_display = ('title', 'content', 'price', 'published') + list_display = ('title', 'content', 'price', 'published', 'rubric') list_display_links = ('title', 'content') search_fields = ('title', 'content', ) -admin.site.register(Bb, BbAdmin) \ No newline at end of file +admin.site.register(Bb, BbAdmin) +admin.site.register(Rubric) \ No newline at end of file diff --git a/samplesite/bboard/migrations/0002_rubric_alter_bb_options_alter_bb_content_and_more.py b/samplesite/bboard/migrations/0002_rubric_alter_bb_options_alter_bb_content_and_more.py new file mode 100644 index 0000000..2e4246e --- /dev/null +++ b/samplesite/bboard/migrations/0002_rubric_alter_bb_options_alter_bb_content_and_more.py @@ -0,0 +1,55 @@ +# Generated by Django 4.1.2 on 2022-10-05 14:29 + +from django.db import migrations, models +import django.db.models.deletion + + +class Migration(migrations.Migration): + + dependencies = [ + ('bboard', '0001_initial'), + ] + + operations = [ + migrations.CreateModel( + name='Rubric', + fields=[ + ('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), + ('name', models.CharField(db_index=True, max_length=20, verbose_name='Название')), + ], + options={ + 'verbose_name': 'Рубрика', + 'verbose_name_plural': 'Рубрики', + 'ordering': ['name'], + }, + ), + migrations.AlterModelOptions( + name='bb', + options={'ordering': ['-published'], 'verbose_name': 'Объявление', 'verbose_name_plural': 'Объявления'}, + ), + migrations.AlterField( + model_name='bb', + name='content', + field=models.TextField(blank=True, null=True, verbose_name='Описание'), + ), + migrations.AlterField( + model_name='bb', + name='price', + field=models.FloatField(blank=True, null=True, verbose_name='Цена'), + ), + migrations.AlterField( + model_name='bb', + name='published', + field=models.DateTimeField(auto_now_add=True, db_index=True, verbose_name='Опубликованно'), + ), + migrations.AlterField( + model_name='bb', + name='title', + field=models.CharField(max_length=50, verbose_name='Товар'), + ), + migrations.AddField( + model_name='bb', + name='rubric', + field=models.ForeignKey(null=True, on_delete=django.db.models.deletion.PROTECT, to='bboard.rubric', verbose_name='Рубрика'), + ), + ] diff --git a/samplesite/bboard/models.py b/samplesite/bboard/models.py index dfb415b..a44d2ed 100644 --- a/samplesite/bboard/models.py +++ b/samplesite/bboard/models.py @@ -1,6 +1,7 @@ from tabnanny import verbose from turtle import title from django.db import models +from django.test import modify_settings class Bb (models.Model): title = models.CharField(max_length=50, verbose_name = 'Товар') @@ -8,7 +9,20 @@ class Bb (models.Model): price = models.FloatField(null=True, blank=True, verbose_name = 'Цена') published = models.DateTimeField(auto_now_add=True, db_index=True, verbose_name = 'Опубликованно') + rubric = models.ForeignKey('Rubric', null = True, on_delete = models.PROTECT, verbose_name = 'Рубрика') + class Meta: verbose_name_plural = 'Объявления' verbose_name = 'Объявление' ordering = ['-published'] + +class Rubric(models.Model): + name = models.CharField(max_length = 20, db_index = True, verbose_name = 'Название') + + def __str__(self) -> str: + return self.name + + class Meta: + verbose_name_plural = 'Рубрики' + verbose_name = 'Рубрика' + ordering = ['name'] \ No newline at end of file diff --git a/samplesite/db.sqlite3 b/samplesite/db.sqlite3 index 8d714f28c3b92b4b264d628319f7c7bf7095a4e4..d8e98d1295b627927eac782daa44cc741a82f029 100644 GIT binary patch delta 2146 zcmcIleQXnD7=Pb;Z|&W-+p|wbvvfU*Fcw&MckQ}$y0BUb>d1frQG>Hw*JE^SEp7!r zpxHV#8u1TE6C3Gy0LZ={^OE+ za`!yH_xF6f&-1=xGu+rDf4Huq1tGM8zVlD#ku^@-a&qT!Al1b)NppDvQ#_NF%MTa# z?x-$8mZ!bJU{oCrNs^=lhW7=B!+imDFs2O$g26y^Z!8>*j4UYnqLG*ui3QY1C@>Tq z))Yxmnq;X-Y7u2uyHja*wK`mKo79+mhQg7+V6@)^Z=*^+7t&lfRV-PJ)qSzufxX)BPWcQ_9}z!`|c9+-qfG?=YWS;1N?b3C~s zaLM@E7l>H0E@|%ca3$wTUN4E1tfSzY#iOglB7~RU%k2+qPtFDDQzK&bSJWpn&*~>L zWBSMXr}~LCHi~Rm%Z0Q-EvDsRbBe|2`W(7%H!Vs&I;WUNH_wr;v{Lvo52uDgdCc^0 z9yo_f-{`7ji6|URnm2nm;Tz$s@Sbp#rm{uos$lVQoS%qT#o`8B7_cp;D+sH;oW;v< zo^NaVT5r8l8b?I9jD*W&U&1Ns;-XNJuwf2a6HgE?pA1i=Sg1i8l8IwJeiJbx%XXHk zpFh@xCz6(l^(@__He>5Nme2v_>*Sc!@N2DB}eR`KT111;uSUjt59!jX{nR6(BwBI=M9&}6kGh9!O>gbPub3HT!}NJC_A!q? z<2Kj&Z8%}gkBW}#-1vq=0m-vVky=z`&UG-j;9JDx=~WQ_fA&Tj~=OsZs3Sw9W9-I314S*Q9b2TtV;;JzZwu3j7Iwq$~D* z4XxSTH=7JuWJuQN2VzKuC73s7&jJ(7BDe{E!wvWieu7!L_!96e;jt+zlD}SETFt=# zqSo)>9Gr#;cnJ=|0ByP+s4VALWU=I8&PACzcnQB)ZW5*tJzMrebJ>Y9S(u{eW5Q_M zRE&V8ZNt3Rb$?Kd1_!jhn7GQ-$m}>^&&^fH-Yy=n?+R;!p%MDI!~WPl$)!kH>2hYJ zQ#QU0jkC?rsD_m6z43UjdC^(yX?L|a6sgVG<{pg~E%ZQl#D`(~iCh9OAS-=eq2 z3H?kap`X=1&x~cp>o7qb`WyO(`YC;iUMwHc_cS#nGUJ(-v%So~MFiL2B4zmkyi16T h|4+iykq-V&Bm}PK2I4xUnFYws3&Un-fe^y;{{bC2k(K}e delta 561 zcmXw#UuaTM9LLY`+`L}@>^J9xYC6o9J!Ghjpuwbxu#Ckpdg?*cZDlu7hps&-UDrdA zJ!~Ai&OWOZYLIR<}+%cpyskJTJc9Cvco{mDGPT}*>oiOX_8<*5l_scB&cGeZ(_+4iU$>yx^T z?ZrpWTi+uxAQTbfj-FxEY z>*B(C4|tnzd3~PX#KnMzGcoX*H+-I+#^3M;Z}LVjDhb6?)oH0bie)-qy+(r@SDQ5{ zKwJ=~GVl9w1B>t0wJ~xT4WbY-Pbx1=Urj^CAI9Mm83Q9X$c{n7ukg5N{swg|>}-XS zIFF_BtY6ky3dd;7d|E%5#dG@oIs6d^Ti56Dx@?eETHP@28uZW%ZtK%g{HLYn@Uwss z!y$r0X4m$?j*vvKBKHHuaD?FK7`w%j5Jj;a=Uhba6F$Q`*oG=RhN8&%7U;zf_>qw6 OAm|9dpw-#Mk*U8DRJYRr