mirror of
https://github.com/daniviga/django-ram.git
synced 2026-02-04 01:50:39 +01:00
Make sure that cache is always cleaned while performing an update
This commit is contained in:
@@ -1,22 +1,60 @@
|
|||||||
from django.contrib import admin
|
|
||||||
from django.conf import settings
|
from django.conf import settings
|
||||||
|
from django.contrib import admin
|
||||||
|
from django.core.cache import cache
|
||||||
|
|
||||||
admin.site.site_header = settings.SITE_NAME
|
admin.site.site_header = settings.SITE_NAME
|
||||||
|
|
||||||
|
|
||||||
def publish(modeladmin, request, queryset):
|
def publish(modeladmin, request, queryset):
|
||||||
for obj in queryset:
|
queryset.update(published=True)
|
||||||
obj.published = True
|
cache.clear()
|
||||||
obj.save()
|
|
||||||
|
|
||||||
|
|
||||||
publish.short_description = "Publish selected items"
|
publish.short_description = "Publish selected items"
|
||||||
|
|
||||||
|
|
||||||
def unpublish(modeladmin, request, queryset):
|
def unpublish(modeladmin, request, queryset):
|
||||||
for obj in queryset:
|
queryset.update(published=False)
|
||||||
obj.published = False
|
cache.clear()
|
||||||
obj.save()
|
|
||||||
|
|
||||||
|
|
||||||
unpublish.short_description = "Unpublish selected items"
|
unpublish.short_description = "Unpublish selected items"
|
||||||
|
|
||||||
|
|
||||||
|
def set_featured(modeladmin, request, queryset):
|
||||||
|
count = queryset.count()
|
||||||
|
if count > settings.FEATURED_ITEMS_MAX:
|
||||||
|
modeladmin.message_user(
|
||||||
|
request,
|
||||||
|
"You can only mark up to {} items as featured.".format(
|
||||||
|
settings.FEATURED_ITEMS_MAX
|
||||||
|
),
|
||||||
|
level="error",
|
||||||
|
)
|
||||||
|
return
|
||||||
|
featured = modeladmin.model.objects.filter(featured=True).count()
|
||||||
|
if featured + count > settings.FEATURED_ITEMS_MAX:
|
||||||
|
modeladmin.message_user(
|
||||||
|
request,
|
||||||
|
"There are already {} featured items. You can only mark {} more items as featured.".format( # noqa: E501
|
||||||
|
featured,
|
||||||
|
settings.FEATURED_ITEMS_MAX - featured,
|
||||||
|
),
|
||||||
|
level="error",
|
||||||
|
)
|
||||||
|
return
|
||||||
|
queryset.update(featured=True)
|
||||||
|
cache.clear()
|
||||||
|
|
||||||
|
|
||||||
|
set_featured.short_description = "Mark selected items as featured"
|
||||||
|
|
||||||
|
|
||||||
|
def unset_featured(modeladmin, request, queryset):
|
||||||
|
queryset.update(featured=False)
|
||||||
|
cache.clear()
|
||||||
|
|
||||||
|
|
||||||
|
unset_featured.short_description = (
|
||||||
|
"Unmark selected items as featured"
|
||||||
|
)
|
||||||
|
|||||||
@@ -6,8 +6,8 @@ from django.utils.html import format_html, format_html_join, strip_tags
|
|||||||
|
|
||||||
from adminsortable2.admin import SortableAdminBase, SortableInlineAdminMixin
|
from adminsortable2.admin import SortableAdminBase, SortableInlineAdminMixin
|
||||||
|
|
||||||
from ram.admin import publish, unpublish
|
|
||||||
from ram.utils import generate_csv
|
from ram.utils import generate_csv
|
||||||
|
from ram.admin import publish, unpublish, set_featured, unset_featured
|
||||||
from repository.models import RollingStockDocument
|
from repository.models import RollingStockDocument
|
||||||
from portal.utils import get_site_conf
|
from portal.utils import get_site_conf
|
||||||
from roster.models import (
|
from roster.models import (
|
||||||
@@ -303,37 +303,4 @@ class RollingStockAdmin(SortableAdminBase, admin.ModelAdmin):
|
|||||||
|
|
||||||
download_csv.short_description = "Download selected items as CSV"
|
download_csv.short_description = "Download selected items as CSV"
|
||||||
|
|
||||||
def set_featured(modeladmin, request, queryset):
|
|
||||||
count = queryset.count()
|
|
||||||
if count > settings.FEATURED_ITEMS_MAX:
|
|
||||||
modeladmin.message_user(
|
|
||||||
request,
|
|
||||||
"You can only mark up to {} items as featured.".format(
|
|
||||||
settings.FEATURED_ITEMS_MAX
|
|
||||||
),
|
|
||||||
level="error",
|
|
||||||
)
|
|
||||||
return
|
|
||||||
featured = RollingStock.objects.filter(featured=True).count()
|
|
||||||
if featured + count > settings.FEATURED_ITEMS_MAX:
|
|
||||||
modeladmin.message_user(
|
|
||||||
request,
|
|
||||||
"There are already {} featured items. You can only mark {} more items as featured.".format( # noqa: E501
|
|
||||||
featured,
|
|
||||||
settings.FEATURED_ITEMS_MAX - featured,
|
|
||||||
),
|
|
||||||
level="error",
|
|
||||||
)
|
|
||||||
return
|
|
||||||
queryset.update(featured=True)
|
|
||||||
|
|
||||||
set_featured.short_description = "Mark selected rolling stock as featured"
|
|
||||||
|
|
||||||
def unset_featured(modeladmin, request, queryset):
|
|
||||||
queryset.update(featured=False)
|
|
||||||
|
|
||||||
unset_featured.short_description = (
|
|
||||||
"Unmark selected rolling stock as featured"
|
|
||||||
)
|
|
||||||
|
|
||||||
actions = [publish, unpublish, set_featured, unset_featured, download_csv]
|
actions = [publish, unpublish, set_featured, unset_featured, download_csv]
|
||||||
|
|||||||
Reference in New Issue
Block a user