This commit is contained in:
24
backlogger/migrations/0002_add_user_to_item.py
Normal file
24
backlogger/migrations/0002_add_user_to_item.py
Normal file
@@ -0,0 +1,24 @@
|
||||
import django.db.models.deletion
|
||||
from django.conf import settings
|
||||
from django.db import migrations, models
|
||||
|
||||
|
||||
class Migration(migrations.Migration):
|
||||
|
||||
dependencies = [
|
||||
('backlogger', '0001_initial'),
|
||||
migrations.swappable_dependency(settings.AUTH_USER_MODEL),
|
||||
]
|
||||
|
||||
operations = [
|
||||
migrations.AddField(
|
||||
model_name='item',
|
||||
name='user',
|
||||
field=models.ForeignKey(
|
||||
null=True,
|
||||
on_delete=django.db.models.deletion.CASCADE,
|
||||
related_name='items',
|
||||
to=settings.AUTH_USER_MODEL,
|
||||
),
|
||||
),
|
||||
]
|
||||
@@ -0,0 +1,20 @@
|
||||
from django.db import migrations
|
||||
|
||||
|
||||
def assign_to_first_user(apps, schema_editor):
|
||||
Item = apps.get_model('backlogger', 'Item')
|
||||
User = apps.get_model('auth', 'User')
|
||||
first_user = User.objects.order_by('id').first()
|
||||
if first_user:
|
||||
Item.objects.filter(user__isnull=True).update(user=first_user)
|
||||
|
||||
|
||||
class Migration(migrations.Migration):
|
||||
|
||||
dependencies = [
|
||||
('backlogger', '0002_add_user_to_item'),
|
||||
]
|
||||
|
||||
operations = [
|
||||
migrations.RunPython(assign_to_first_user, migrations.RunPython.noop),
|
||||
]
|
||||
@@ -1,3 +1,4 @@
|
||||
from django.contrib.auth.models import User
|
||||
from django.db import models
|
||||
|
||||
|
||||
@@ -13,6 +14,8 @@ class Item(models.Model):
|
||||
(OTHER, 'Other'),
|
||||
]
|
||||
|
||||
user = models.ForeignKey(User, on_delete=models.CASCADE, related_name='items', null=True)
|
||||
|
||||
category = models.CharField(max_length=10, choices=CATEGORY_CHOICES)
|
||||
name = models.CharField(max_length=200)
|
||||
progress_percent = models.FloatField(default=0.0)
|
||||
|
||||
@@ -19,7 +19,7 @@ def item_list(request):
|
||||
category = request.GET.get('category', '')
|
||||
sort = request.GET.get('sort', 'fav')
|
||||
|
||||
items = Item.objects.all()
|
||||
items = Item.objects.filter(user=request.user)
|
||||
if category:
|
||||
items = items.filter(category=category)
|
||||
items = items.order_by(*SORT_MAP.get(sort, SORT_MAP['fav']))
|
||||
@@ -37,7 +37,9 @@ def item_add(request):
|
||||
if request.method == 'POST':
|
||||
form = ItemForm(request.POST)
|
||||
if form.is_valid():
|
||||
form.save()
|
||||
item = form.save(commit=False)
|
||||
item.user = request.user
|
||||
item.save()
|
||||
return redirect('backlogger:list')
|
||||
else:
|
||||
form = ItemForm()
|
||||
@@ -46,7 +48,7 @@ def item_add(request):
|
||||
|
||||
@login_required
|
||||
def item_edit(request, pk):
|
||||
item = get_object_or_404(Item, pk=pk)
|
||||
item = get_object_or_404(Item, pk=pk, user=request.user)
|
||||
if request.method == 'POST':
|
||||
form = ItemForm(request.POST, instance=item)
|
||||
if form.is_valid():
|
||||
@@ -60,5 +62,5 @@ def item_edit(request, pk):
|
||||
@login_required
|
||||
def item_delete(request, pk):
|
||||
if request.method == 'POST':
|
||||
get_object_or_404(Item, pk=pk).delete()
|
||||
get_object_or_404(Item, pk=pk, user=request.user).delete()
|
||||
return redirect('backlogger:list')
|
||||
|
||||
Reference in New Issue
Block a user