From b5d4a64c0437e671f0273ed564c4f1f6734b86ca Mon Sep 17 00:00:00 2001
From: Pierre-Yves Chibon <pingou@pingoured.fr>
Date: Nov 27 2017 21:09:20 +0000
Subject: [PATCH 1/3] Simplify the logic used the issues template for the ordering


Turns out this was not working in production, likely due to the
difference in flask version.

Signed-off-by: Pierre-Yves Chibon <pingou@pingoured.fr>

---

diff --git a/pagure/templates/issues.html b/pagure/templates/issues.html
index 2c2ed3a..b1b91f4 100644
--- a/pagure/templates/issues.html
+++ b/pagure/templates/issues.html
@@ -151,44 +151,56 @@
     {% endfor %}
   </span>
 </section>
-{% set base_url_for = dict(
-  repo=repo.name, username=username,namespace=repo.namespace, tags=tags,
-  author=author, assignee=assignee, priority=priority) %}
+
 <div class="card m-t-1 table-responsive">
 <table id="pagure-issues-list" class="table table-hover table-striped m-b-0">
     <thead class="thead-default">
         <tr>
-          <th id="issue-title"><a href="{{ url_for('view_issues', **dict(
-            base_url_for, status=status or 'all', order_key='title',
-            order='title' | table_get_link_order(order_key, order))) }}">Issue</a>
+          <th id="issue-title"><a href="{{ url_for('view_issues',
+            repo=repo.name, username=username, namespace=repo.namespace,
+            tags=tags, author=author, assignee=assignee, priority=priority,
+            status=status or 'all', order_key='title',
+            order='title' | table_get_link_order(order_key, order) )}}">Issue</a>
             {{ 'title' | table_sort_arrow(order_key, order) | safe }}</th>
-          <th class="open_date"><a href="{{ url_for('view_issues', **dict(
-            base_url_for, status=status or 'all', order_key='date_created',
-            order='date_created' | table_get_link_order(order_key, order))) }}">Opened</a>
+          <th class="open_date"><a href="{{ url_for('view_issues',
+            repo=repo.name, username=username, namespace=repo.namespace,
+            tags=tags, author=author, assignee=assignee, priority=priority,
+            status=status or 'all', order_key='date_created',
+            order='date_created' | table_get_link_order(order_key, order)) }}">Opened</a>
             {{ 'date_created' | table_sort_arrow(order_key, order) | safe }}</th>
           {% if status and status|lower != 'open' %}
-          <th class="close_date"><a href="{{ url_for('view_issues', **dict(
-            base_url_for, status='Closed', order_key='closed_at',
-            order='closed_at' | table_get_link_order(order_key, order))) }}">Closed</a>
+          <th class="close_date"><a href="{{ url_for('view_issues',
+            repo=repo.name, username=username, namespace=repo.namespace,
+            tags=tags, author=author, assignee=assignee, priority=priority,
+            status='Closed', order_key='closed_at',
+            order='closed_at' | table_get_link_order(order_key, order)) }}">Closed</a>
             {{ 'closed_at' | table_sort_arrow(order_key, order) | safe }}</th>
           {% else %}
-          <th class="mod_date"><a href="{{ url_for('view_issues', **dict(
-            base_url_for, status=status or 'all', order_key='last_updated',
-            order='last_updated' | table_get_link_order(order_key, order))) }}">Modified</a>
+          <th class="mod_date"><a href="{{ url_for('view_issues',
+            repo=repo.name, username=username, namespace=repo.namespace,
+            tags=tags, author=author, assignee=assignee, priority=priority,
+            status=status or 'all', order_key='last_updated',
+            order='last_updated' | table_get_link_order(order_key, order)) }}">Modified</a>
             {{ 'last_updated' | table_sort_arrow(order_key, order) | safe }}</th>
           {% endif %}
-          <th class="Priority"><a href="{{ url_for('view_issues', **dict(
-            base_url_for, status=status or 'all', order_key='priority',
-            order='priority' | table_get_link_order(order_key, order))) }}">Priority</a>
+          <th class="Priority"><a href="{{ url_for('view_issues',
+            repo=repo.name, username=username,namespace=repo.namespace,
+            tags=tags, author=author, assignee=assignee, priority=priority,
+            status=status or 'all', order_key='priority',
+            order='priority' | table_get_link_order(order_key, order)) }}">Priority</a>
             {{ 'priority' | table_sort_arrow(order_key, order) | safe }}</th>
-          <th class="open_by"><a href="{{ url_for('view_issues', **dict(
-            base_url_for, status=status or 'all', order_key='user',
-            order='user' | table_get_link_order(order_key, order))) }}">Reporter</a>
+          <th class="open_by"><a href="{{ url_for('view_issues',
+            repo=repo.name, username=username, namespace=repo.namespace,
+            tags=tags, author=author, assignee=assignee, priority=priority,
+            status=status or 'all', order_key='user',
+            order='user' | table_get_link_order(order_key, order)) }}">Reporter</a>
             {{ 'user' | table_sort_arrow(order_key, order) | safe }}</th>
           {% if not status or status|lower == 'open' %}
-          <th class="assigned"><a href="{{ url_for('view_issues', **dict(
-            base_url_for, status=status or 'all', order_key='assignee',
-            order='assignee' | table_get_link_order(order_key, order))) }}">Assignee</a>
+          <th class="assigned"><a href="{{ url_for('view_issues',
+            repo=repo.name, username=username, namespace=repo.namespace,
+            tags=tags, author=author, assignee=assignee, priority=priority,
+            status=status or 'all', order_key='assignee',
+            order='assignee' | table_get_link_order(order_key, order)) }}">Assignee</a>
             {{ 'assignee' | table_sort_arrow(order_key, order) | safe }}</th>
           {% endif %}
         </tr>

From 12b925017284b2708ad19c99226eeb3b346cd8fb Mon Sep 17 00:00:00 2001
From: Pierre-Yves Chibon <pingou@pingoured.fr>
Date: Nov 27 2017 21:11:43 +0000
Subject: [PATCH 2/3] Fix ordering the issues by author or assignee


The solution we had was relying on code added in sqlalchemy 1.0.0 while
this is newer than the sqlalchemy version in production.
This falls back to older (but also working) code.

Signed-off-by: Pierre-Yves Chibon <pingou@pingoured.fr>

---

diff --git a/pagure/lib/__init__.py b/pagure/lib/__init__.py
index 17ccbed..9ee286c 100644
--- a/pagure/lib/__init__.py
+++ b/pagure/lib/__init__.py
@@ -2551,14 +2551,14 @@ def search_issues(
             # We must do a LEFT JOIN on model.Issue.assignee because there are
             # two foreign keys on model.Issue tied to model.User. This tells
             # SQLAlchemy which foreign key on model.User to order on.
-            query = query.join(model.User, model.Issue.assignee, isouter=True)
+            query = query.outerjoin(model.User, model.Issue.assignee)
             column = model.User.user
         # If we are ordering by user, then order by reporters' usernames
         elif order_key == 'user':
             # We must do a LEFT JOIN on model.Issue.user because there are
             # two foreign keys on model.Issue tied to model.User. This tells
             # SQLAlchemy which foreign key on model.User to order on.
-            query = query.join(model.User, model.Issue.user, isouter=True)
+            query = query.outerjoin(model.User, model.Issue.user)
             column = model.User.user
         elif order_key in model.Issue.__table__.columns.keys():
             column = getattr(model.Issue, order_key)

From 16c2c052020ebc91d87b7fb6f0c40c0944bff70c Mon Sep 17 00:00:00 2001
From: Pierre-Yves Chibon <pingou@pingoured.fr>
Date: Nov 27 2017 21:12:30 +0000
Subject: [PATCH 3/3] Fix unit-tests


Signed-off-by: Pierre-Yves Chibon <pingou@pingoured.fr>

---

diff --git a/tests/test_pagure_lib.py b/tests/test_pagure_lib.py
index a7a5d73..2d1bfee 100644
--- a/tests/test_pagure_lib.py
+++ b/tests/test_pagure_lib.py
@@ -5499,7 +5499,8 @@ foo bar
                 'pull_request_close',
                 'pull_request_comment',
                 'pull_request_flag',
-                'pull_request_merge'
+                'pull_request_merge',
+                'pull_request_subscribe',
             ]
         )