Merge branch 'main' into typing-foirequest

okfde · Mar 3, 2022 · b2ee568 · b2ee568
2 parents 99c3c96 + 3a3f12b
commit b2ee568
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 1 deletion.
diff --git a/froide/foirequest/admin.py b/froide/foirequest/admin.py
@@ -200,6 +200,7 @@ class FoiRequestAdmin(admin.ModelAdmin):
         "mark_same_as",
         "update_index",
         "confirm_request",
+        "publish",
         "unpublish",
         "add_to_project",
         "unblock_request",
@@ -386,6 +387,15 @@ def unpublish(self, request, queryset):
 
     unpublish.short_description = _("Unpublish")
 
+    def publish(self, request, queryset):
+        from .utils import update_foirequest_index
+
+        queryset.update(public=True, visibility=FoiRequest.VISIBILITY.VISIBLE_TO_PUBLIC)
+        update_foirequest_index(queryset)
+        self.message_user(request, _("Selected requests are now published."))
+
+    publish.short_description = _("Publish")
+
     def unblock_request(self, request, queryset):
         for req in queryset:
             mes = req.messages[0]

diff --git a/froide/problem/models.py b/froide/problem/models.py
@@ -159,7 +159,7 @@ def resolve(self, user, resolution=""):
         return inform_user_problem_resolved(self)
 
     def resolve_identical(self, user, resolution=""):
-        self.objects.find_and_resolve(
+        ProblemReport.objects.find_and_resolve(
             message=self.message, kind=self.kind, user=user, resolution=resolution
         )