Repository : http://git.fedorahosted.org/cgit/copr.git
On branch : master
commit 34a3138845d27bce3fe114401689a719d5576ec7 Author: Bohuslav Kabrda bkabrda@redhat.com Date: Mon Jan 21 09:51:07 2013 +0100
Move displaying builds to single view
.../coprs/templates/coprs/detail/builds.html | 12 +++++++----- .../coprs/templates/coprs/show_builds.html | 13 ------------- .../coprs/views/coprs_ns/coprs_builds.py | 8 ++++---- .../coprs/views/coprs_ns/coprs_general.py | 11 ----------- 4 files changed, 11 insertions(+), 33 deletions(-)
diff --git a/coprs_frontend/coprs/templates/coprs/detail/builds.html b/coprs_frontend/coprs/templates/coprs/detail/builds.html index 117a82d..7ce3ec7 100644 --- a/coprs_frontend/coprs/templates/coprs/detail/builds.html +++ b/coprs_frontend/coprs/templates/coprs/detail/builds.html @@ -1,12 +1,14 @@ {% extends "coprs/detail.html" %} +{% from "_helpers.html" import render_pagination %} {% from "coprs/detail/_builds_table.html" import builds_table with context %}
{% block detail_body %} {% if copr.builds %} - <h3>Latest 10 in this repo</h3> - {{ builds_table(copr.builds) }} - <a href="{{ url_for('coprs_ns.copr_show_builds', username = copr.owner.name, coprname = copr.name) }}">Show all builds</a> - {% else %} - <h3>No builds so far</h3> + {{ builds_table(copr.builds) }} + <div class="pagination"> + {{ render_pagination(request, paginator) }} + </div> + {% else %} + <h2>No builds so far.</h2> {% endif %} {% endblock %} diff --git a/coprs_frontend/coprs/templates/coprs/show_builds.html b/coprs_frontend/coprs/templates/coprs/show_builds.html deleted file mode 100644 index cf19cb8..0000000 --- a/coprs_frontend/coprs/templates/coprs/show_builds.html +++ /dev/null @@ -1,13 +0,0 @@ -{% extends "layout.html" %} -{% block title %}Builds in {{ request.view_args['name'] }}{% endblock %} -{% block header %}Builds in {{ request.view_args['name'] }} Copr{% endblock %} -{% from "_helpers.html" import render_pagination %} -{% from "coprs/_builds_table.html" import builds_table with context %} -{% from "coprs/_coprs_forms.html" import copr_build_cancel_form %} -{% block body %} - {{ builds_table(builds) }} - <div class=pagination> - {{ render_pagination(request, paginator) }} - </div> - <a href="{{ url_for('coprs_ns.copr_detail', username = request.view_args['username'], coprname = request.view_args['coprname']) }}">Back to Copr</a> -{% endblock %} diff --git a/coprs_frontend/coprs/views/coprs_ns/coprs_builds.py b/coprs_frontend/coprs/views/coprs_ns/coprs_builds.py index 646da72..1fe0ff1 100644 --- a/coprs_frontend/coprs/views/coprs_ns/coprs_builds.py +++ b/coprs_frontend/coprs/views/coprs_ns/coprs_builds.py @@ -15,18 +15,18 @@ from coprs.views.misc import login_required from coprs.views.coprs_ns import coprs_ns from coprs.views.coprs_ns import coprs_general
-@coprs_ns.route('/detail/<username>/<coprname>/builds/', defaults = {'page': 1}) +@coprs_ns.route('/detail/<username>/<coprname>/builds/', defaults={'page': 1}) @coprs_ns.route('/detail/<username>/<coprname>/builds/int:page/') -def copr_show_builds(username, coprname, page = 1): +def copr_builds(username, coprname, page=1): copr = coprs_logic.CoprsLogic.get(flask.g.user, username, coprname).first()
if not copr: # hey, this Copr doesn't exist return page_not_found('Copr with name {0} does not exist.'.format(coprname))
- builds_query = builds_logic.BuildsLogic.get_multiple(flask.g.user, copr = copr) + builds_query = builds_logic.BuildsLogic.get_multiple(flask.g.user, copr=copr)
paginator = helpers.Paginator(builds_query, copr.build_count, page, per_page_override = 20) - return flask.render_template('coprs/show_builds.html', builds = paginator.sliced_query, paginator = paginator) + return flask.render_template('coprs/detail/builds.html', copr=copr, builds=paginator.sliced_query, paginator=paginator)
@coprs_ns.route('/detail/<username>/<coprname>/add_build/') diff --git a/coprs_frontend/coprs/views/coprs_ns/coprs_general.py b/coprs_frontend/coprs/views/coprs_ns/coprs_general.py index 2b1eff6..b878db0 100644 --- a/coprs_frontend/coprs/views/coprs_ns/coprs_general.py +++ b/coprs_frontend/coprs/views/coprs_ns/coprs_general.py @@ -127,17 +127,6 @@ def copr_permissions(username, coprname): permissions = permissions, current_user_permissions = user_perm)
-@coprs_ns.route('/detail/<username>/<coprname>/builds/') -def copr_builds(username, coprname): - try: # query[0:10][0] will raise an index error, if Copr doesn't exist - query = coprs_logic.CoprsLogic.get(flask.g.user, username, coprname, with_builds = True) - copr = query[0:10][0]# we retrieved all builds, but we got one copr in a list... - except IndexError: - return page_not_found('Copr with name {0} does not exist.'.format(coprname)) - - return flask.render_template('coprs/detail/builds.html', - copr = copr) - @coprs_ns.route('/detail/<username>/<coprname>/edit/') @login_required def copr_edit(username, coprname, form=None):
copr-devel@lists.fedorahosted.org