From 75e3ccc3a590887622b215ac3c295fa7bb42506a Mon Sep 17 00:00:00 2001 From: Victor Seva Date: Thu, 9 Mar 2023 12:48:36 +0100 Subject: [PATCH] MT#55988 improve export process add export action on admin Change-Id: I18f211cd6157b55bc9bbc8d76f10aa38790bcfbb --- build/admin.py | 5 +++-- buildinfo/admin.py | 3 ++- hotfix/admin.py | 7 ++++--- release_changed/admin.py | 5 +++-- release_dashboard/admin.py | 9 +++++---- repoapi/admin.py | 9 +++++---- tracker/admin.py | 5 +++-- 7 files changed, 25 insertions(+), 18 deletions(-) diff --git a/build/admin.py b/build/admin.py index 3e88f67..8209682 100644 --- a/build/admin.py +++ b/build/admin.py @@ -1,4 +1,4 @@ -# Copyright (C) 2017-2022 The Sipwise Team - http://sipwise.com +# Copyright (C) 2017-2023 The Sipwise Team - http://sipwise.com # # This program is free software: you can redistribute it and/or modify it # under the terms of the GNU General Public License as published by the Free @@ -14,6 +14,7 @@ # with this program. If not, see . from django.contrib import admin from import_export import resources +from import_export.admin import ExportActionModelAdmin from import_export.admin import ImportExportModelAdmin from . import models @@ -25,7 +26,7 @@ class BuildReleaseResource(resources.ModelResource): @admin.register(models.BuildRelease) -class BuildReleaseAdmin(ImportExportModelAdmin): +class BuildReleaseAdmin(ImportExportModelAdmin, ExportActionModelAdmin): resource_class = BuildReleaseResource list_filter = ("release",) readonly_fields = ( diff --git a/buildinfo/admin.py b/buildinfo/admin.py index c14cea6..bed3b70 100644 --- a/buildinfo/admin.py +++ b/buildinfo/admin.py @@ -17,6 +17,7 @@ import re from django.contrib import admin from django.utils.html import format_html from import_export import resources +from import_export.admin import ExportActionModelAdmin from import_export.admin import ImportExportModelAdmin from . import models @@ -71,7 +72,7 @@ class JobTypeListFilter(admin.SimpleListFilter): @admin.register(models.BuildInfo) -class BuildInfoAdmin(ImportExportModelAdmin): +class BuildInfoAdmin(ImportExportModelAdmin, ExportActionModelAdmin): resource_class = BuildInfoResource list_filter = ( DurationListFilter, diff --git a/hotfix/admin.py b/hotfix/admin.py index 190bef7..c48afd5 100644 --- a/hotfix/admin.py +++ b/hotfix/admin.py @@ -1,4 +1,4 @@ -# Copyright (C) 2022 The Sipwise Team - http://sipwise.com +# Copyright (C) 2022-2023 The Sipwise Team - http://sipwise.com # # This program is free software: you can redistribute it and/or modify it # under the terms of the GNU General Public License as published by the Free @@ -14,6 +14,7 @@ # with this program. If not, see . from django.contrib import admin from import_export import resources +from import_export.admin import ExportActionModelAdmin from import_export.admin import ImportExportModelAdmin from . import models @@ -25,7 +26,7 @@ class WorkfrontNoteInfoResource(resources.ModelResource): @admin.register(models.WorkfrontNoteInfo) -class WorkfrontNoteInfoAdmin(ImportExportModelAdmin): +class WorkfrontNoteInfoAdmin(ImportExportModelAdmin, ExportActionModelAdmin): resource_class = WorkfrontNoteInfoResource list_filter = ("projectname",) @@ -36,6 +37,6 @@ class MantisNoteInfoResource(resources.ModelResource): @admin.register(models.MantisNoteInfo) -class MantisNoteInfoAdmin(ImportExportModelAdmin): +class MantisNoteInfoAdmin(ImportExportModelAdmin, ExportActionModelAdmin): resource_class = MantisNoteInfoResource list_filter = ("projectname",) diff --git a/release_changed/admin.py b/release_changed/admin.py index 35f5793..b876f9f 100644 --- a/release_changed/admin.py +++ b/release_changed/admin.py @@ -1,4 +1,4 @@ -# Copyright (C) 2020-2022 The Sipwise Team - http://sipwise.com +# Copyright (C) 2020-2023 The Sipwise Team - http://sipwise.com # # This program is free software: you can redistribute it and/or modify it # under the terms of the GNU General Public License as published by the Free @@ -14,6 +14,7 @@ # with this program. If not, see . from django.contrib import admin from import_export import resources +from import_export.admin import ExportActionModelAdmin from import_export.admin import ImportExportModelAdmin from . import models @@ -25,5 +26,5 @@ class ReleaseChangedResource(resources.ModelResource): @admin.register(models.ReleaseChanged) -class ReleaseChangedAdmin(ImportExportModelAdmin): +class ReleaseChangedAdmin(ImportExportModelAdmin, ExportActionModelAdmin): resource_class = ReleaseChangedResource diff --git a/release_dashboard/admin.py b/release_dashboard/admin.py index 60ed668..fc76bb5 100644 --- a/release_dashboard/admin.py +++ b/release_dashboard/admin.py @@ -1,4 +1,4 @@ -# Copyright (C) 2016-2022 The Sipwise Team - http://sipwise.com +# Copyright (C) 2016-2023 The Sipwise Team - http://sipwise.com # # This program is free software: you can redistribute it and/or modify it # under the terms of the GNU General Public License as published by the Free @@ -14,6 +14,7 @@ # with this program. If not, see . from django.contrib import admin from import_export import resources +from import_export.admin import ExportActionModelAdmin from import_export.admin import ImportExportModelAdmin from . import models @@ -35,15 +36,15 @@ class DockerImageResource(resources.ModelResource): @admin.register(models.DockerTag) -class DockerTagAdmin(ImportExportModelAdmin): +class DockerTagAdmin(ImportExportModelAdmin, ExportActionModelAdmin): resource_class = DockerTagResource @admin.register(models.DockerImage) -class DockerImageAdmin(ImportExportModelAdmin): +class DockerImageAdmin(ImportExportModelAdmin, ExportActionModelAdmin): resource_class = DockerImageResource @admin.register(models.Project) -class ProjectAdmin(ImportExportModelAdmin): +class ProjectAdmin(ImportExportModelAdmin, ExportActionModelAdmin): resource_class = ProjectResource diff --git a/repoapi/admin.py b/repoapi/admin.py index 1bfa33a..84c491b 100644 --- a/repoapi/admin.py +++ b/repoapi/admin.py @@ -16,6 +16,7 @@ from django.contrib import admin from django.utils.html import format_html from django_admin_filters import DateRange from import_export import resources +from import_export.admin import ExportActionModelAdmin from import_export.admin import ImportExportModelAdmin from . import models @@ -32,7 +33,7 @@ class GerritRepoInfoResource(resources.ModelResource): @admin.register(models.JenkinsBuildInfo) -class JenkinsBuildInfoAdmin(ImportExportModelAdmin): +class JenkinsBuildInfoAdmin(ImportExportModelAdmin, ExportActionModelAdmin): resource_class = JenkinsBuildInfoResource list_filter = ("param_release", "projectname") @@ -58,7 +59,7 @@ class GRIDateRange(DateRange): @admin.register(models.GerritRepoInfo) -class GerritRepoInfoAdmin(ImportExportModelAdmin): +class GerritRepoInfoAdmin(ImportExportModelAdmin, ExportActionModelAdmin): resource_class = GerritRepoInfoResource list_filter = (("modified", GRIDateRange), "projectname", "param_ppa") readonly_fields = ("gerrit_url",) @@ -73,7 +74,7 @@ class WorkfrontNoteInfoResource(resources.ModelResource): @admin.register(models.WorkfrontNoteInfo) -class WorkfrontNoteInfoAdmin(ImportExportModelAdmin): +class WorkfrontNoteInfoAdmin(ImportExportModelAdmin, ExportActionModelAdmin): resource_class = WorkfrontNoteInfoResource @@ -83,5 +84,5 @@ class MantisNoteInfoResource(resources.ModelResource): @admin.register(models.MantisNoteInfo) -class MantisNoteInfoAdmin(ImportExportModelAdmin): +class MantisNoteInfoAdmin(ImportExportModelAdmin, ExportActionModelAdmin): resource_class = MantisNoteInfoResource diff --git a/tracker/admin.py b/tracker/admin.py index 8943b8a..1a40f46 100644 --- a/tracker/admin.py +++ b/tracker/admin.py @@ -1,4 +1,4 @@ -# Copyright (C) 2022 The Sipwise Team - http://sipwise.com +# Copyright (C) 2022-2023 The Sipwise Team - http://sipwise.com # # This program is free software: you can redistribute it and/or modify it # under the terms of the GNU General Public License as published by the Free @@ -14,6 +14,7 @@ # with this program. If not, see . from django.contrib import admin from import_export import resources +from import_export.admin import ExportActionModelAdmin from import_export.admin import ImportExportModelAdmin from . import models @@ -35,6 +36,6 @@ class TrackerMapperResource(resources.ModelResource): @admin.register(models.TrackerMapper) -class TrackerMapperAdmin(ImportExportModelAdmin): +class TrackerMapperAdmin(ImportExportModelAdmin, ExportActionModelAdmin): resource_class = TrackerMapperResource list_filter = ["mapper_type"]