From 0dc6c41899def8127b8176f4ea2d863757b19560 Mon Sep 17 00:00:00 2001
From: Johannes Krampf <johannes.krampf@gmail.com>
Date: Fri, 2 Dec 2011 19:16:20 +0100
Subject: Fix bug tracker URLs

---
 packages/templatetags/package_extras.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'packages')

diff --git a/packages/templatetags/package_extras.py b/packages/templatetags/package_extras.py
index 01d9afd6..bcbda210 100644
--- a/packages/templatetags/package_extras.py
+++ b/packages/templatetags/package_extras.py
@@ -92,7 +92,7 @@ def svn_trunk(package):
 
 @register.simple_tag
 def bugs_list(package):
-    url = "https://bugs.parabolagnulinux.org/bugs/issue?"
+    url = "https://bugs.parabolagnulinux.org/bugs/issue"
     data = {
         '@action': 'search',
         'title': package.pkgname,
@@ -101,7 +101,7 @@ def bugs_list(package):
 
 @register.simple_tag
 def bug_report(package):
-    url = "https://bugs.parabolagnulinux.org/bugs/issue?"
+    url = "https://bugs.parabolagnulinux.org/bugs/issue"
     data = {
         '@template': 'item',
         'keyword': 'packages',
-- 
cgit v1.2.3-54-g00ecf


From 8ceb83e52897c1c0bccc6322cffb0e864664afd1 Mon Sep 17 00:00:00 2001
From: Johannes Krampf <johannes.krampf@gmail.com>
Date: Fri, 2 Dec 2011 19:46:36 +0100
Subject: Fix download link. Solution looks a bit unclean to me.

---
 packages/templatetags/package_extras.py | 12 ++++++++++++
 templates/packages/details.html         |  2 +-
 2 files changed, 13 insertions(+), 1 deletion(-)

(limited to 'packages')

diff --git a/packages/templatetags/package_extras.py b/packages/templatetags/package_extras.py
index bcbda210..c31990d7 100644
--- a/packages/templatetags/package_extras.py
+++ b/packages/templatetags/package_extras.py
@@ -72,6 +72,18 @@ def userpkgs(user):
         )
     return ''
 
+@register.simple_tag
+def get_download_link(package):
+    parts = {
+        "repo": package.repo.name.lower(),
+        "arch": package.arch.name,
+        "pkgfile": package.filename
+    }
+    if parts["arch"] == "any":
+        parts["arch"] = "i686"
+    linkbase = "https://repo.parabolagnulinux.org/%(repo)s/os/%(arch)s/%(pkgfile)s"
+    return linkbase % parts
+
 @register.simple_tag
 def get_wiki_link(package):
     url = "https://wiki.parabolagnulinux.org/index.php"
diff --git a/templates/packages/details.html b/templates/packages/details.html
index ef501c83..4570627f 100644
--- a/templates/packages/details.html
+++ b/templates/packages/details.html
@@ -39,7 +39,7 @@ <h4>Package Actions</h4>
                     onclick="return !window.open('/packages/flaghelp/','FlagHelp',
                     'height=350,width=450,location=no,scrollbars=yes,menubars=no,toolbars=no,resizable=no');">(?)</a></li>
                 {% endif %}
-                <li><a href="download/" rel="nofollow" title="Download {{ pkg.pkgname }} from mirror">Download From Mirror</a></li>
+                <li><a href="{% get_download_link pkg %}" rel="nofollow" title="Download {{ pkg.pkgname }} from mirror">Download From Mirror</a></li>
             </ul>
 
             {% if perms.main.change_package %}
-- 
cgit v1.2.3-54-g00ecf