Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

CONCD-696 Improve import dashboards campaign filters list #2297

Merged
merged 3 commits into from
Feb 27, 2024
Merged

CONCD-696 Improve import dashboards campaign filters list #2297

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
e4faac8
CONCD-696 For all 3 import dashboards, sort campaigns alphabetically
rasarkar Feb 27, 2024
30bea0e
CONCD-696 do not include retired campaigns in campaign filter list
rasarkar Feb 27, 2024
39b29b2
CONCD-696 fixing the 'not allowed' error
rasarkar Feb 27, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
34 changes: 30 additions & 4 deletions importer/admin.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,12 @@
from django.contrib import admin, messages
from django.contrib.humanize.templatetags.humanize import naturaltime

from concordia.admin.filters import CampaignProjectListFilter, NullableTimestampFilter
from concordia.admin.filters import (
CampaignListFilter,
CampaignProjectListFilter,
NullableTimestampFilter,
)
from concordia.models import Campaign

from .models import ImportItem, ImportItemAsset, ImportJob
from .tasks import download_asset_task
Expand Down Expand Up @@ -55,6 +60,27 @@ class ImportJobAssetProjectListFilter(CampaignProjectListFilter):
project_ref = "import_item__job__project_id"


class ImportCampaignListFilter(CampaignListFilter):
def lookups(self, request, model_admin):
queryset = Campaign.objects.exclude(status=Campaign.Status.RETIRED)
return queryset.values_list("id", "title").order_by("title")


class ImportJobCampaignListFilter(ImportCampaignListFilter):
parameter_name = "project__campaign"
status_filter_parameter = "project__campaign__status"


class ImportItemCampaignListFilter(ImportCampaignListFilter):
parameter_name = "job__project__campaign"
status_filter_parameter = "job__project__campaign__status"


class ImportItemAssetCampaignListFilter(ImportCampaignListFilter):
parameter_name = "import_item__job__project__campaign"
status_filter_parameter = "import_item__job__project__campaign__status"


class TaskStatusModelAdmin(admin.ModelAdmin):
readonly_fields = (
"created",
Expand Down Expand Up @@ -116,7 +142,7 @@ class ImportJobAdmin(TaskStatusModelAdmin):
CompletedFilter,
FailedFilter,
("created_by", admin.RelatedOnlyFieldListFilter),
"project__campaign",
ImportJobCampaignListFilter,
ImportJobProjectListFilter,
)
search_fields = ("url", "status")
Expand All @@ -139,7 +165,7 @@ class ImportItemAdmin(TaskStatusModelAdmin):
CompletedFilter,
FailedFilter,
("job__created_by", admin.RelatedOnlyFieldListFilter),
"job__project__campaign",
ImportItemCampaignListFilter,
ImportJobItemProjectListFilter,
)
search_fields = ("url", "status")
Expand All @@ -166,7 +192,7 @@ class ImportItemAssetAdmin(TaskStatusModelAdmin):
CompletedFilter,
FailedFilter,
("import_item__job__created_by", admin.RelatedOnlyFieldListFilter),
"import_item__job__project__campaign",
ImportItemAssetCampaignListFilter,
ImportJobAssetProjectListFilter,
)
search_fields = ("url", "status")
Expand Down