change recycle bin sort (16a733c9) · Commits · certic / Jama

rpc/methods.py

+9 −4

Original line number	Diff line number	Diff line
		@@ -34,7 +34,8 @@ import pyvips
		import cv2
		import numpy
		from resources.helpers import handle_local_file as _handle_local_file

		from datetime import timedelta
		from django.utils import timezone

		logger = logging.getLogger(__name__)

		@@ -2603,9 +2604,12 @@ def recycle_bin(user: User, project_id: int) -> List[Dict]:
		"""
		_check_project_permission(user, project_id, PERM_COLLECTION_READ)
		_check_project_permission(user, project_id, PERM_RESOURCE_READ)

		date_limit = timezone.now() - timedelta(days=15)

		results = []
		for collection_instance in Collection.objects.filter(
		deleted_at__isnull=False, project_id=project_id
		deleted_at__isnull=False, project_id=project_id, deleted_at__gt=date_limit
		).order_by("-deleted_at"):
		results.append(
		{
		@@ -2616,7 +2620,7 @@ def recycle_bin(user: User, project_id: int) -> List[Dict]:
		}
		)
		for resource_instance in Resource.objects.filter(
		deleted_at__isnull=False, ptr_project_id=project_id
		deleted_at__isnull=False, ptr_project_id=project_id, deleted_at__gt=date_limit
		).order_by("-deleted_at"):
		results.append(
		{
		@@ -2626,7 +2630,8 @@ def recycle_bin(user: User, project_id: int) -> List[Dict]:
		"deleted_at": resource_instance.deleted_at.isoformat(),
		}
		)
		return results

		return sorted(results, key="deleted_at", reverse=True)


		@_log_call