activity: use new /patch/ URLs

Simplify the Activity query now that patch links no longer need a
commitfest ID.

Author: jchampio

pgcommitfest/commitfest/feeds.py

@@ -30,12 +30,7 @@ def item_description(self, item):
         )
 
     def item_link(self, item):
-        if self.cfid:
-            return "https://commitfest.postgresql.org/{0}/{1}/".format(
-                self.cfid, item["patchid"]
-            )
-        else:
-            return "https://commitfest.postgresql.org/{cfid}/{patchid}/".format(**item)
+        return "https://commitfest.postgresql.org/patch/{0}/".format(item["patchid"])
 
     def item_pubdate(self, item):
         return item["date"]

pgcommitfest/commitfest/templates/activity.html

@@ -16,7 +16,7 @@
     <tr>
      <td style="white-space: nowrap;">{{a.date}}</td>
      <td>{{a.by}}</td>
-     <td><a href="/{%if commitfest%}{{commitfest.id}}{%else%}{{a.cfid}}{%endif%}/{{a.patchid}}/">{{a.name}}</a></td>
+     <td><a href="/patch/{{a.patchid}}/">{{a.name}}</a></td>
      <td>{{a.what}}</td>
     </tr>
    {%endfor%}

pgcommitfest/commitfest/views.py

@@ -168,7 +168,7 @@ def activity(request, cfid=None, rss=None):
         cf = None
         where = ""
 
-    sql = "SELECT ph.date, auth_user.username AS by, ph.what, p.id AS patchid, p.name, (SELECT max(commitfest_id) FROM commitfest_patchoncommitfest poc WHERE poc.patch_id=p.id) AS cfid FROM commitfest_patchhistory ph INNER JOIN commitfest_patch p ON ph.patch_id=p.id INNER JOIN auth_user on auth_user.id=ph.by_id {0} ORDER BY ph.date DESC LIMIT {1}".format(
+    sql = "SELECT ph.date, auth_user.username AS by, ph.what, p.id AS patchid, p.name FROM commitfest_patchhistory ph INNER JOIN commitfest_patch p ON ph.patch_id=p.id INNER JOIN auth_user on auth_user.id=ph.by_id {0} ORDER BY ph.date DESC LIMIT {1}".format(
         where, num
     )