From df164b5d4deddac0351de5958e70a22c34deed75 Mon Sep 17 00:00:00 2001
From: Michael Simacek <msimacek@redhat.com>
Date: Apr 07 2016 07:29:59 +0000
Subject: [view] Nicer handling of url args


---

diff --git a/koschei/views.py b/koschei/views.py
index ab36758..c2f2a44 100644
--- a/koschei/views.py
+++ b/koschei/views.py
@@ -36,7 +36,7 @@ def create_backend():
                                           'secondary': koji_session})
 
 
-def page_args(**kwargs):
+def page_args(clear=False, **kwargs):
     def proc_order(order):
         new_order = []
         for item in order:
@@ -46,10 +46,15 @@ def page_args(**kwargs):
         return ','.join(new_order)
     if 'order_by' in kwargs:
         kwargs['order_by'] = proc_order(kwargs['order_by'])
+    if kwargs.get('collection') == g.default_collection.name:
+        kwargs.pop('collection')
     # the supposedly unnecessary call to items() is needed
-    args = {k: v for k, v in dict(request.args.items(), **kwargs).items()
-            if v is not None}
-    return urllib.urlencode(args)
+    unfiltered = kwargs if clear else dict(request.args.items(), **kwargs)
+    args = {k: v for k, v in unfiltered.items() if v is not None}
+    encoded = urllib.urlencode(args).replace('...', "' + this.value + '")
+    if encoded:
+        return '?' + encoded
+    return ''
 
 
 def format_evr(epoch, version, release):
@@ -228,6 +233,7 @@ def get_collections():
         .all()
     if not g.collections:
         abort(500, "No collections setup")
+    g.default_collection = g.collections[0]
     if collection_name:
         for collection in g.collections:
             if collection.name == collection_name:
@@ -236,7 +242,7 @@ def get_collections():
         else:
             abort(404, "Collection not found")
     else:
-        g.current_collection = g.collections[0]
+        g.current_collection = g.default_collection
 
 
 @app.route('/')
diff --git a/templates/base.html b/templates/base.html
index dd23605..ea746bc 100644
--- a/templates/base.html
+++ b/templates/base.html
@@ -88,9 +88,9 @@
                     <form>
                         <label for="collection">Package collection:</label>
                         <select name="collection"
-                            select onchange="javascript: window.location = '?{{
-                            page_args(page=None, collection=None)
-                            }}&amp;collection=' + this.value;">
+                            select onchange="javascript: window.location = '{{
+                            page_args(page=None, collection='...')
+                            }}';">
                             {% for collection in g.collections %}
                             <option value="{{ collection.name }}"
                             {% if collection.id == g.current_collection.id %}selected="selected"{% endif %}>
diff --git a/templates/macros.html b/templates/macros.html
index 1d9cd5a..b2f4429 100644
--- a/templates/macros.html
+++ b/templates/macros.html
@@ -5,7 +5,7 @@
                            {{ page.total }}</span>
     <form class="pageJump">
         Page:
-        <select onchange="javascript: window.location = '?{{ page_args(page=None) }}&amp;page=' + this.value;">
+        <select onchange="javascript: window.location = '{{ page_args(page='...') }}';">
             {% for i in range(1, page.page) %}
             <option value="{{ i }}">{{ i }}</option>
             {% endfor %}
@@ -56,7 +56,7 @@
 
             <tr class="row-odd pkg-{{ package.state_string }}">
                 <td>
-                    <a href="{{ url_for('package_detail', name=package.name) }}?collection={{ g.current_collection.name }}">{{ package.name }}</a>
+                    <a href="{{ url_for('package_detail', name=package.name) }}{{ page_args(clear=True, collection=g.current_collection.name) }}">{{ package.name }}</a>
                 </td>
                 <td>
                     <div class="hidden">{{ package.state_string }}</div>
@@ -121,11 +121,11 @@
 {% macro ordered_column(name, title, current_order) %}
 <th>
     {% if name in current_order[:1] %}
-    <a href="?{{ page_args(order_by=['-' + name.lower()] + current_order) }}">{{ title }}</a>
+    <a href="{{ page_args(order_by=['-' + name.lower()] + current_order) }}">{{ title }}</a>
     <img src="{{ url_for('static', filename='images/gray-triangle-down.gif') }}"
          class="sort" alt="Decending sort"/>
     {% else %}
-        <a href="?{{ page_args(order_by=[name.lower()] + current_order) }}">{{ title }}</a>
+        <a href="{{ page_args(order_by=[name.lower()] + current_order) }}">{{ title }}</a>
         {% if '-' + name in current_order[:1] %}
         <img src="{{ url_for('static', filename='images/gray-triangle-up.gif') }}"
              class="sort" alt="Ascending sort"/>