Private
Public Access
Add subscription editing, feed-level tags, and a remembered stream filter
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>
This commit is contained in:
1 parent
cfa64b5485
commit
3b58fdcb7e
15 files changed
+376
-23
No files matched your search
+57
-1
@@ -6,7 +6,10 @@ from django.http import HttpResponse
|
||||
from django.shortcuts import get_object_or_404, redirect, render
|
||||
from django.views.decorators.http import require_POST
|
||||
|
||||
from .forms import AddFeedForm, OPMLImportForm
|
||||
from apps.articles.forms import AddTagForm
|
||||
from apps.articles.models import SubscriptionTag, Tag
|
||||
|
||||
from .forms import AddFeedForm, EditSubscriptionForm, OPMLImportForm
|
||||
from .models import Feed, Subscription
|
||||
from .opml import export_opml, import_opml, parse_opml
|
||||
from .services.fetcher import fetch_and_ingest
|
||||
@@ -63,6 +66,59 @@ def subscription_list(request):
|
||||
return render(request, "feeds/subscriptions.html", {"subscriptions": subscriptions})
|
||||
|
||||
|
||||
@login_required
|
||||
def edit_subscription(request, subscription_id):
|
||||
subscription = get_object_or_404(Subscription, user=request.user, pk=subscription_id)
|
||||
form = EditSubscriptionForm(request.POST or None, instance=subscription, user=request.user)
|
||||
if request.method == "POST" and form.is_valid():
|
||||
form.save()
|
||||
messages.success(request, f"Updated '{subscription.display_title}'.")
|
||||
return redirect("feeds:subscription_list")
|
||||
|
||||
return render(
|
||||
request, "feeds/edit_subscription.html", {"form": form, "subscription": subscription}
|
||||
)
|
||||
|
||||
|
||||
@login_required
|
||||
def subscription_tags_partial(request, subscription_id):
|
||||
subscription = get_object_or_404(Subscription, user=request.user, pk=subscription_id)
|
||||
tags = Tag.objects.filter(
|
||||
subscription_tags__subscription=subscription, subscription_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,
|
||||
"feeds/_subscription_tags.html",
|
||||
{"subscription": subscription, "tags": tags, "all_user_tags": all_user_tags},
|
||||
)
|
||||
|
||||
|
||||
@login_required
|
||||
@require_POST
|
||||
def add_tag_to_subscription(request, subscription_id):
|
||||
subscription = get_object_or_404(Subscription, user=request.user, pk=subscription_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)
|
||||
SubscriptionTag.objects.get_or_create(
|
||||
user=request.user, subscription=subscription, tag=tag
|
||||
)
|
||||
return subscription_tags_partial(request, subscription_id)
|
||||
|
||||
|
||||
@login_required
|
||||
@require_POST
|
||||
def remove_tag_from_subscription(request, subscription_id, tag_id):
|
||||
subscription = get_object_or_404(Subscription, user=request.user, pk=subscription_id)
|
||||
SubscriptionTag.objects.filter(
|
||||
user=request.user, subscription=subscription, tag_id=tag_id
|
||||
).delete()
|
||||
return subscription_tags_partial(request, subscription_id)
|
||||
|
||||
|
||||
@login_required
|
||||
@require_POST
|
||||
def unsubscribe(request, subscription_id):
|
||||
|
||||
Reference in new issue
Block a user