From 6f0ec0592e2189e37aca21575bf6834e1113f47e Mon Sep 17 00:00:00 2001
From: Julen Landa Alustiza <jlanda@fedoraproject.org>
Date: Feb 11 2020 13:18:34 +0000
Subject: [PATCH 1/3] 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()
 

From fa343dd40172542c733742e07f7f02acabd7593d Mon Sep 17 00:00:00 2001
From: Julen Landa Alustiza <jlanda@fedoraproject.org>
Date: Feb 14 2020 10:39:14 +0000
Subject: [PATCH 2/3] update updated_on on add_pull_request_flag


---

diff --git a/pagure/lib/query.py b/pagure/lib/query.py
index cbc0704..f64a757 100644
--- a/pagure/lib/query.py
+++ b/pagure/lib/query.py
@@ -1497,6 +1497,7 @@ def add_pull_request_flag(
             user_id=user_obj.id,
             token_id=token,
         )
+    request.updated_on = datetime.datetime.utcnow()
     session.add(pr_flag)
     # Make sure we won't have SQLAlchemy error before we continue
     session.flush()

From 10f5fa9e4d63e1a66471927c540018703cb2d70e Mon Sep 17 00:00:00 2001
From: Julen Landa Alustiza <jlanda@fedoraproject.org>
Date: Feb 14 2020 10:42:07 +0000
Subject: [PATCH 3/3] templates/issues.html: render updated_on instead of last_updated on related pull request's info

Fixes #4695

---

diff --git a/pagure/templates/issue.html b/pagure/templates/issue.html
index f1e57b1..771e563 100644
--- a/pagure/templates/issue.html
+++ b/pagure/templates/issue.html
@@ -620,7 +620,7 @@ namespace=repo.namespace, repo=repo.name, issueid=issueid)
                   namespace=pr.project.namespace,
                   requestid=pr.id) }}">#{{pr.id}}</a>
               {{ pr.status if pr.status != 'Open' else 'Last updated'
-                }} {{ pr.last_updated | humanize }}
+                }} {{ pr.updated_on | humanize }}
             </li>
             {% endfor %}
           </ul>