Private
Public Access
Subscription editing was a real gap: there was no way to rename a feed's display title, move it between folders, or create a folder at all outside OPML import. Added an edit page (apps/feeds/views.py:edit_subscription, EditSubscriptionForm) reachable from the subscriptions list. Added feed-level tagging via a new SubscriptionTag model (apps/articles/ models.py), mirroring the existing ArticleTag — tag a whole feed on its edit page, and every one of its articles surfaces under that tag in the stream alongside individually-tagged articles (apps.reader.views._apply_ scope now matches either). Renamed AddTagToArticleForm to AddTagForm since it's shared by both now. The stream also now remembers the last filter (unread/all/starred/saved) in the session instead of always defaulting to "unread" when a sidebar feed/folder/tag link omits ?filter= — sidebar links no longer force ?filter=all, letting the remembered choice apply. Verified end to end against a running dev server: editing a subscription's title/folder, creating a folder inline, tagging a feed and seeing its articles appear under that tag, and the remembered-filter behavior across requests with no ?filter= param. Co-Authored-By: Claude Sonnet 5 <noreply@anthropic.com>
69 lines
2.3 KiB
Python
69 lines
2.3 KiB
Python
from django.contrib.auth.decorators import login_required
|
|
from django.http import Http404
|
|
from django.shortcuts import get_object_or_404, redirect, render
|
|
from django.views.decorators.http import require_POST
|
|
|
|
from .forms import AddTagForm, TagForm
|
|
from .models import Article, ArticleTag, Tag
|
|
|
|
|
|
def _owned_article(user, article_id):
|
|
try:
|
|
return Article.objects.get(feed__subscriptions__user=user, pk=article_id)
|
|
except Article.DoesNotExist:
|
|
raise Http404
|
|
|
|
|
|
@login_required
|
|
def tag_list(request):
|
|
form = TagForm(request.POST or None)
|
|
if request.method == "POST" and form.is_valid():
|
|
tag = form.save(commit=False)
|
|
tag.user = request.user
|
|
tag.save()
|
|
return redirect("articles:tag_list")
|
|
|
|
tags = Tag.objects.filter(user=request.user)
|
|
return render(request, "articles/tags.html", {"tags": tags, "form": form})
|
|
|
|
|
|
@login_required
|
|
@require_POST
|
|
def delete_tag(request, tag_id):
|
|
tag = get_object_or_404(Tag, user=request.user, pk=tag_id)
|
|
tag.delete()
|
|
return redirect("articles:tag_list")
|
|
|
|
|
|
@login_required
|
|
def article_tags_partial(request, article_id):
|
|
article = _owned_article(request.user, article_id)
|
|
tags = Tag.objects.filter(article_tags__article=article, article_tags__user=request.user)
|
|
all_user_tags = Tag.objects.filter(user=request.user).exclude(pk__in=[t.pk for t in tags])
|
|
return render(
|
|
request,
|
|
"articles/_article_tags.html",
|
|
{"article": article, "tags": tags, "all_user_tags": all_user_tags},
|
|
)
|
|
|
|
|
|
@login_required
|
|
@require_POST
|
|
def add_tag_to_article(request, article_id):
|
|
article = _owned_article(request.user, article_id)
|
|
form = AddTagForm(request.POST)
|
|
if form.is_valid():
|
|
tag_name = form.cleaned_data["tag_name"].strip()
|
|
if tag_name:
|
|
tag, _ = Tag.objects.get_or_create(user=request.user, name=tag_name)
|
|
ArticleTag.objects.get_or_create(user=request.user, article=article, tag=tag)
|
|
return article_tags_partial(request, article_id)
|
|
|
|
|
|
@login_required
|
|
@require_POST
|
|
def remove_tag_from_article(request, article_id, tag_id):
|
|
article = _owned_article(request.user, article_id)
|
|
ArticleTag.objects.filter(user=request.user, article=article, tag_id=tag_id).delete()
|
|
return article_tags_partial(request, article_id)
|