corbz/PYRSS-Website
corbz/PYRSS-Website
1
0
Fork 0
Code Issues 21 Pull Requests Actions Releases 1 Wiki Activity

content order and footer links
All checks were successful
Build and Push Docker Image / build (push) Successful in 16s
Details

Browse Source
This commit is contained in:
Corban-Lee Jones 2024-09-13 14:58:52 +01:00
parent 86cd053bc4
commit 53ddffc3ba
3 changed files with 21 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
CHANGELOG.md
View File

@ -1,4 +1,12 @@
**unreleased v0.3.5**
- Fix: Footer links pointing to unused older domain
- Fix: Tracked Content incorrectly ordering by oldest first
-
-
-
**v0.3.4** **v0.3.4**
- Fix: Refresh data tables after deleting any number of entries (corbz/PYRSS-Website#38) - Fix: Refresh data tables after deleting any number of entries (corbz/PYRSS-Website#38)

21
apps/api/views.py
View File

@ -42,7 +42,7 @@ def is_automated_admin(user):
# ================================================================================================= # =================================================================================================
# SubChannel Views #region SubChannels
class SubChannel_ListView(generics.ListCreateAPIView): class SubChannel_ListView(generics.ListCreateAPIView):
""" """
@ -114,7 +114,7 @@ class SubChannel_DetailView(generics.RetrieveUpdateDestroyAPIView):
# ================================================================================================= # =================================================================================================
# Filter Views #region Filter
class Filter_ListView(generics.ListCreateAPIView): class Filter_ListView(generics.ListCreateAPIView):
""" """
@ -191,7 +191,7 @@ class Filter_DetailView(generics.RetrieveUpdateDestroyAPIView):
# ================================================================================================= # =================================================================================================
# Subscription Views #region Subscription
class Subscription_ListView(generics.ListCreateAPIView): class Subscription_ListView(generics.ListCreateAPIView):
""" """
@ -320,7 +320,7 @@ class Subscription_SubChannelView(generics.DestroyAPIView):
return Response(status=status.HTTP_204_NO_CONTENT) return Response(status=status.HTTP_204_NO_CONTENT)
# ================================================================================================= # =================================================================================================
# SavedGuild Views #region Saved Guilds
class SavedGuild_ListView(generics.ListCreateAPIView): class SavedGuild_ListView(generics.ListCreateAPIView):
""" """
@ -405,7 +405,7 @@ class SavedGuild_DetailView(generics.RetrieveDestroyAPIView):
# ================================================================================================= # =================================================================================================
# GuildSettings Views #region Guild Settings
class GuildSettings_ListView(generics.ListCreateAPIView): class GuildSettings_ListView(generics.ListCreateAPIView):
""" """
@ -488,7 +488,7 @@ class GuildSettings_DetailView(generics.RetrieveUpdateDestroyAPIView):
# ================================================================================================= # =================================================================================================
# TrackedContent Views #region Tracked Content
class TrackedContent_ListView(generics.ListCreateAPIView): class TrackedContent_ListView(generics.ListCreateAPIView):
""" """
@ -503,7 +503,6 @@ class TrackedContent_ListView(generics.ListCreateAPIView):
pagination_class = DefaultPagination pagination_class = DefaultPagination
metadata_class = ExpandedMetadata metadata_class = ExpandedMetadata
queryset = TrackedContent.objects.all().order_by("-creation_datetime")
filter_backends = [filters.SearchFilter, rest_filters.DjangoFilterBackend, filters.OrderingFilter] filter_backends = [filters.SearchFilter, rest_filters.DjangoFilterBackend, filters.OrderingFilter]
filterset_fields = ["guid", "title", "url", "subscription", "subscription__guild_id", "channel_id", "blocked", "creation_datetime"] filterset_fields = ["guid", "title", "url", "subscription", "subscription__guild_id", "channel_id", "blocked", "creation_datetime"]
@ -521,12 +520,12 @@ class TrackedContent_ListView(generics.ListCreateAPIView):
def get_queryset(self): def get_queryset(self):
if self.request.user.is_superuser: if self.request.user.is_superuser:
return TrackedContent.objects.all() return TrackedContent.objects.all().order_by("-creation_datetime")
saved_guilds = SavedGuilds.objects.filter(added_by=self.request.user) saved_guilds = SavedGuilds.objects.filter(added_by=self.request.user)
guild_ids = [guild.guild_id for guild in saved_guilds] guild_ids = [guild.guild_id for guild in saved_guilds]
return TrackedContent.objects.filter(subscription__guild_id__in=guild_ids) return TrackedContent.objects.filter(subscription__guild_id__in=guild_ids).order_by("-creation_datetime")
def post(self, request): def post(self, request):
serializer = self.get_serializer(data=request.data) serializer = self.get_serializer(data=request.data)
@ -557,7 +556,6 @@ class TrackedContent_DetailView(generics.RetrieveUpdateDestroyAPIView):
parser_classes = [MultiPartParser, FormParser] parser_classes = [MultiPartParser, FormParser]
serializer_class = TrackedContentSerializer_POST serializer_class = TrackedContentSerializer_POST
queryset = TrackedContent.objects.all().order_by("-creation_datetime")
def get_queryset(self): def get_queryset(self):
if self.request.user.is_superuser: if self.request.user.is_superuser:
@ -569,6 +567,9 @@ class TrackedContent_DetailView(generics.RetrieveUpdateDestroyAPIView):
return TrackedContent.objects.filter(subscription__guild_id__in=guild_ids) return TrackedContent.objects.filter(subscription__guild_id__in=guild_ids)
# =================================================================================================
#region Article Mutator
class ArticleMutator_ListView(generics.ListCreateAPIView): class ArticleMutator_ListView(generics.ListCreateAPIView):
""" """
View to provide a list of ArticleMutator model instances. View to provide a list of ArticleMutator model instances.

4
apps/templates/includes/footer.html
View File

@ -5,12 +5,12 @@
</div> </div>
<ul class="nav col-md-4 d-flex justify-content-end list-unstyled"> <ul class="nav col-md-4 d-flex justify-content-end list-unstyled">
<li class="ms-3"> <li class="ms-3">
<a href="https://gitea.corbz.dev/corbz/PYRSS-Website" class="text-reset" target="_blank"> <a href="https://gitea.cor.bz/corbz/PYRSS-Website" class="text-reset" target="_blank">
<i class="bi bi-git fs-5"></i> <i class="bi bi-git fs-5"></i>
</a> </a>
</li> </li>
<li class="ms-3"> <li class="ms-3">
<a href="https://gitea.corbz.dev/corbz/PYRSS-Website/wiki" class="text-reset" target="_blank"> <a href="https://gitea.cor.bz/corbz/PYRSS-Website/wiki" class="text-reset" target="_blank">
<i class="bi bi-question-lg fs-5"></i> <i class="bi bi-question-lg fs-5"></i>
</a> </a>
</li> </li>