[Pkg-debile-commits] [debile-web] 12/16: Update of the search form to point to the right page

[Sylvestre Ledru]

This is an automated email from the git hooks/post-receive script.

sylvestre pushed a commit to branch update-usuability
in repository debile-web.

commit 0b67aaf06c98333946d7ff5dbf74649c7cddecad
Author: Sylvestre Ledru <sylvestre at debian.org>
Date:   Wed Aug 28 16:09:02 2013 +0200

    Update of the search form to point to the right page
---
 debileweb/blueprints/frontend.py |   32 ++++++++------------------------
 templates/search.html            |    2 +-
 2 files changed, 9 insertions(+), 25 deletions(-)

diff --git a/debileweb/blueprints/frontend.py b/debileweb/blueprints/frontend.py
index 9b1afa2..8363497 100644
--- a/debileweb/blueprints/frontend.py
+++ b/debileweb/blueprints/frontend.py
@@ -20,6 +20,7 @@
 from flask import Blueprint, render_template, send_file, request, redirect
 from flask.ext.jsonpify import jsonify
 
+from sqlalchemy import func
 from sqlalchemy.orm import joinedload
 
 from debilemaster.orm import Package, Source, Binary, Machine, User, Job, Group
@@ -145,14 +146,18 @@ def group_list(group_id, page=0):
         "page": page,
     })
 
-
+ at frontend.route("/source/search/", methods=['POST'])
 @frontend.route("/source/<owner_name>/<package_name>/<package_version>/<int:run_number>")
-def source(package_name, owner_name, package_version, run_number):
+def source(package_name="", owner_name="fred", package_version="latest", run_number=1):
+    if request.method == 'POST':
+        # Switch a better url
+        return redirect('/source/'+owner_name+'/'+request.form['package'] +'/'+package_version + '/' + str(run_number))
+
     session = Session()
 
     # Let's compute all the versions that exists for this package
     versions_query = session.query(Source.version)\
-	    .join(Source.user)\
+        .join(Source.user)\
         .filter(Source.name == package_name)\
         .filter(User.login == owner_name)
     versions = sorted(set([e[0] for e in versions_query.all()]))
@@ -399,24 +404,3 @@ def search_package():
     result = [r[0] for r in packages_query]
     return jsonify(result)
 
- at frontend.route('/package/', methods=['POST'])
- at frontend.route('/package/<package_name>/', methods=['GET'])
-def package(package_name=""):
-    if request.method == 'POST':
-        # Switch a better url
-        return redirect('/package/'+request.form['package']+'/')
-
-    session = Session()
-    import logging
-    logging.basicConfig(filename='db.log')
-    logging.getLogger('sqlalchemy.engine').setLevel(logging.INFO)
-    packages_query = session.query(Source, Job.type, Job.subtype, Job.arch)\
-        .join(Job, Job.package_id ==  Source.source_id)\
-        .filter(Source.name == package_name)
-#.having(Source.version.max())
-
-    return render_template('package.html', **{
-            "package_name": package_name,
-            "package": packages_query,
-        })
-
diff --git a/templates/search.html b/templates/search.html
index 65d0890..083a727 100644
--- a/templates/search.html
+++ b/templates/search.html
@@ -28,7 +28,7 @@
   </style> 
 
 <table><tr><td>By package</td><td>
-<form id="searchPackageForm" action="/package/" method="POST">
+<form id="searchPackageForm" action="/source/search/" method="POST">
   <div class="ui-widget">{{form.package(size=20)}}
  <input type="submit" value="Search" /></div>
 </form>

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-debile/debile-web.git