From asamalik at fedoraproject.org Wed Aug 19 23:38:15 2015 Content-Type: multipart/mixed; boundary="===============4130071307023943242==" MIME-Version: 1.0 From: asamalik at fedoraproject.org To: copr-commits at lists.fedorahosted.org Subject: [copr] master: package view (8d2db45) Date: Mon, 03 Aug 2015 11:32:19 +0000 Message-ID: <20150803113219.9206961147@fedorahosted.org> --===============4130071307023943242== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Repository : http://git.fedorahosted.org/cgit/copr.git On branch : master >--------------------------------------------------------------- commit 8d2db455d404d4ba601d7fa2f27d567b032aeb32 Author: Adam Samalik Date: Fri Jul 31 12:22:49 2015 +0200 package view >--------------------------------------------------------------- .../templates/coprs/detail/_builds_table.html | 2 +- .../coprs/templates/coprs/detail/builds.html | 2 +- .../coprs/templates/coprs/detail/package.html | 27 ++++++++++++++++= ++++ .../coprs/views/coprs_ns/coprs_builds.py | 18 +++++++++++++ 4 files changed, 47 insertions(+), 2 deletions(-) diff --git a/frontend/coprs_frontend/coprs/templates/coprs/detail/_builds_t= able.html b/frontend/coprs_frontend/coprs/templates/coprs/detail/_builds_ta= ble.html index 99b8146..f431011 100644 --- a/frontend/coprs_frontend/coprs/templates/coprs/detail/_builds_table.ht= ml +++ b/frontend/coprs_frontend/coprs/templates/coprs/detail/_builds_table.ht= ml @@ -1,6 +1,6 @@ {% from "coprs/detail/_builds_forms.html" import copr_build_cancel_form, c= opr_build_repeat_form, copr_build_delete_form %} = -{% macro builds_table(builds, page) %} +{% macro builds_table(builds) %} {% if builds %} diff --git a/frontend/coprs_frontend/coprs/templates/coprs/detail/builds.ht= ml b/frontend/coprs_frontend/coprs/templates/coprs/detail/builds.html index e5c7b02..45cf74a 100644 --- a/frontend/coprs_frontend/coprs/templates/coprs/detail/builds.html +++ b/frontend/coprs_frontend/coprs/templates/coprs/detail/builds.html @@ -13,6 +13,6 @@ {% block detail_body %}

Project Builds

This view shows all builds in the project

- {{ builds_table(builds, paginator.page) }} + {{ builds_table(builds) }} {{ build_states() }} {% endblock %} diff --git a/frontend/coprs_frontend/coprs/templates/coprs/detail/package.h= tml b/frontend/coprs_frontend/coprs/templates/coprs/detail/package.html new file mode 100644 index 0000000..f3a45a3 --- /dev/null +++ b/frontend/coprs_frontend/coprs/templates/coprs/detail/package.html @@ -0,0 +1,27 @@ +{% extends "coprs/detail.html" %} +{% from "coprs/detail/_describe_source.html" import describe_source %} + +{% block title %}Package {{ package.name }} in {{ package.copr.owner.name = }}/{{ package.copr.name }}{% endblock %} +{%block project_breadcrumb %} +
  • + Packages +
  • +
  • + {{package.name}} +
  • +{%endblock%} + +{% block detail_body %} + +

    {{ package.name }}

    +
    +
    +
    +
    Package Name:
    +
    + {{package.name}} +
    +
    +
    +
    +{% endblock %} diff --git a/frontend/coprs_frontend/coprs/views/coprs_ns/coprs_builds.py b= /frontend/coprs_frontend/coprs/views/coprs_ns/coprs_builds.py index 654d555..dca7efa 100644 --- a/frontend/coprs_frontend/coprs/views/coprs_ns/coprs_builds.py +++ b/frontend/coprs_frontend/coprs/views/coprs_ns/coprs_builds.py @@ -15,6 +15,7 @@ from coprs import helpers = from coprs.logic import builds_logic from coprs.logic import coprs_logic +from coprs.logic import packages_logic = from coprs.views.misc import login_required, page_not_found from coprs.views.coprs_ns import coprs_ns @@ -69,6 +70,23 @@ def copr_builds(username, coprname, page=3D1): builds=3Dbuilds_query) = = +(a)coprs_ns.route("///package//") +def copr_package(username, coprname, package_name): + copr =3D coprs_logic.CoprsLogic.get(username, coprname).first() + + if not copr: + return page_not_found( + "Project {0} does not exist.".format(coprname)) + + package =3D packages_logic.PackagesLogic.get(copr.id, package_name).fi= rst() + + if not package: + return page_not_found( + "Package {0} does not exist in this project.".format(package_n= ame)) + + return flask.render_template("coprs/detail/package.html", package=3Dpa= ckage, copr=3Dcopr) + + @coprs_ns.route("///add_build/") @login_required def copr_add_build(username, coprname, form=3DNone): --===============4130071307023943242==--