From 6f0ec0592e2189e37aca21575bf6834e1113f47e Mon Sep 17 00:00:00 2001 From: Julen Landa Alustiza Date: Feb 11 2020 13:18:34 +0000 Subject: lib/query: order pull requests based on updated_on column when we want to order based on last updated time --- diff --git a/pagure/lib/query.py b/pagure/lib/query.py index a9246db..cbc0704 100644 --- a/pagure/lib/query.py +++ b/pagure/lib/query.py @@ -3230,7 +3230,9 @@ def search_pull_requests( column = model.PullRequest.date_created if order_key == "last_updated": - column = model.PullRequest.last_updated + # We actually want to order on updated_on and not last_updated + # https://pagure.io/pagure/issue/4464#comment-624915 + column = model.PullRequest.updated_on if requestid: query = query.filter(model.PullRequest.id == requestid) diff --git a/tests/test_pagure_flask_ui_fork.py b/tests/test_pagure_flask_ui_fork.py index fc53674..3c92360 100644 --- a/tests/test_pagure_flask_ui_fork.py +++ b/tests/test_pagure_flask_ui_fork.py @@ -1529,7 +1529,7 @@ class PagureFlaskForktests(tests.Modeltests): pr_one = pagure.lib.query.search_pull_requests( self.session, project_id=1, requestid=1 ) - pr_one.last_updated = datetime.utcnow() + timedelta(seconds=2) + pr_one.updated_on = datetime.utcnow() + timedelta(seconds=2) self.session.add(pr_one) self.session.commit()