From f27a192c577aa294acab9d3d817e2bbdfc78f335 Mon Sep 17 00:00:00 2001 From: Pavel Raiskup Date: Wed, 11 Dec 2019 09:42:36 +0100 Subject: [PATCH] copr: frontend: hotfix for PR#1158 --- .../frontend-cloud/files/order-recent-tasks.patch | 11 +++++++++++ roles/copr/frontend-cloud/tasks/main.yml | 5 +++++ 2 files changed, 16 insertions(+) create mode 100644 roles/copr/frontend-cloud/files/order-recent-tasks.patch diff --git a/roles/copr/frontend-cloud/files/order-recent-tasks.patch b/roles/copr/frontend-cloud/files/order-recent-tasks.patch new file mode 100644 index 0000000000..3e8901967f --- /dev/null +++ b/roles/copr/frontend-cloud/files/order-recent-tasks.patch @@ -0,0 +1,11 @@ +--- /usr/share/copr/coprs_frontend/coprs/logic/builds_logic.py 2019-12-11 06:29:55.000000000 +0000 ++++ /usr/share/copr/coprs_frontend/coprs/logic/builds_logic.py 2019-12-11 08:38:06.132204688 +0000 +@@ -102,7 +102,7 @@ + def get_recent_tasks(cls, *args, **kwargs): + task_ids = cls.get_recent_task_ids(*args, **kwargs) + query = models.Build.query.filter(models.Build.id.in_(task_ids)) +- return list(query.all()) ++ return sorted(query.all(), key=lambda o: task_ids.index(o.id)) + + @classmethod + def get_running_tasks_by_time(cls, start, end): diff --git a/roles/copr/frontend-cloud/tasks/main.yml b/roles/copr/frontend-cloud/tasks/main.yml index ed76c7219b..68e5f3bb1d 100644 --- a/roles/copr/frontend-cloud/tasks/main.yml +++ b/roles/copr/frontend-cloud/tasks/main.yml @@ -45,6 +45,11 @@ # dest=/the/patched/file.py # tags: patches +- name: order recent tasks again, pr 1158 + patch: src=patches/disable-cgit-refresh.patch + dest=/usr/share/copr/coprs_frontend/coprs/logic/builds_logic.py + tags: patches + - name: directory for postgresql dumps file: state=directory path=/var/www/html/db_dumps/ owner=copr-fe mode=755