Repository :
http://git.fedorahosted.org/cgit/copr.git
On branch : master
---------------------------------------------------------------
commit 162eaffff477bf2f9753ba517ef1f7c6ffe0642d
Author: Adam Samalik <asamalik(a)redhat.com>
Date: Mon Aug 3 12:34:18 2015 +0200
[frontend] package view + dist git link
---------------------------------------------------------------
frontend/coprs_frontend/config/copr.conf | 2 ++
frontend/coprs_frontend/config/copr_devel.conf | 2 ++
frontend/coprs_frontend/coprs/config.py | 2 ++
frontend/coprs_frontend/coprs/models.py | 10 ++++++++++
.../coprs/templates/coprs/detail/build.html | 2 ++
.../coprs/templates/coprs/detail/monitor.html | 2 +-
.../coprs/templates/coprs/detail/package.html | 20 +++++++++++++++++---
7 files changed, 36 insertions(+), 4 deletions(-)
diff --git a/frontend/coprs_frontend/config/copr.conf
b/frontend/coprs_frontend/config/copr.conf
index 58d558b..265f5d2 100644
--- a/frontend/coprs_frontend/config/copr.conf
+++ b/frontend/coprs_frontend/config/copr.conf
@@ -78,6 +78,8 @@ SEND_EMAILS = True
PUBLIC_COPR_HOSTNAME = "copr.fedoraproject.org"
+DIST_GIT_URL = "http://copr-dist-git-dev.fedorainfracloud.org/cgit/"
+
# primary
LOG_FILENAME = "/var/log/copr/frontend.log"
diff --git a/frontend/coprs_frontend/config/copr_devel.conf
b/frontend/coprs_frontend/config/copr_devel.conf
index 04221e4..1fa0712 100644
--- a/frontend/coprs_frontend/config/copr_devel.conf
+++ b/frontend/coprs_frontend/config/copr_devel.conf
@@ -43,6 +43,8 @@ ENFORCE_PROTOCOL_FOR_FRONTEND_URL = "http"
PUBLIC_COPR_HOSTNAME = "copr-fe-dev.cloud.fedoraproject.org"
+DIST_GIT_URL = "http://copr-dist-git-dev.fedorainfracloud.org/cgit/"
+
LOG_FILENAME="/tmp/copr_frontend.log"
# IP or subnet
diff --git a/frontend/coprs_frontend/coprs/config.py
b/frontend/coprs_frontend/coprs/config.py
index e8a5a34..535d923 100644
--- a/frontend/coprs_frontend/coprs/config.py
+++ b/frontend/coprs_frontend/coprs/config.py
@@ -40,6 +40,8 @@ class Config(object):
PUBLIC_COPR_HOSTNAME = "copr-fe-dev.cloud.fedoraproject.org"
+ DIST_GIT_URL = None
+
# primary log file
LOG_FILENAME = "/var/log/copr/frontend.log"
diff --git a/frontend/coprs_frontend/coprs/models.py
b/frontend/coprs_frontend/coprs/models.py
index 47385ec..5d0c7b8 100644
--- a/frontend/coprs_frontend/coprs/models.py
+++ b/frontend/coprs_frontend/coprs/models.py
@@ -7,6 +7,7 @@ from libravatar import libravatar_url
from coprs import constants
from coprs import db
from coprs import helpers
+from coprs import app
import itertools
import operator
@@ -301,6 +302,15 @@ class Package(db.Model, helpers.Serializer):
def source_json_dict(self):
return json.loads(self.source_json)
+ @property
+ def source_type_text(self):
+ return helpers.BuildSourceEnum(self.source_type)
+
+ @property
+ def dist_git_url(self):
+ if app.config["DIST_GIT_URL"]:
+ return "{}/{}.git".format(app.config["DIST_GIT_URL"],
self.dist_git_repo)
+ return None
class Build(db.Model, helpers.Serializer):
diff --git a/frontend/coprs_frontend/coprs/templates/coprs/detail/build.html
b/frontend/coprs_frontend/coprs/templates/coprs/detail/build.html
index eb311f5..9956046 100644
--- a/frontend/coprs_frontend/coprs/templates/coprs/detail/build.html
+++ b/frontend/coprs_frontend/coprs/templates/coprs/detail/build.html
@@ -26,7 +26,9 @@
<dt> Package Name:</dt>
<dd>
{% if build.package %}
+ <a href="{{url_for('coprs_ns.copr_package',
username=build.copr.owner.name, package_name=build.package.name,
coprname=copr.name)}}">
{{ build.package.name }}
+ </a>
{% else %}
-
{% endif %}
diff --git a/frontend/coprs_frontend/coprs/templates/coprs/detail/monitor.html
b/frontend/coprs_frontend/coprs/templates/coprs/detail/monitor.html
index 77642b1..aa2e03b 100644
--- a/frontend/coprs_frontend/coprs/templates/coprs/detail/monitor.html
+++ b/frontend/coprs_frontend/coprs/templates/coprs/detail/monitor.html
@@ -46,7 +46,7 @@
{{ state }}
</a> <br />
{% if pkg_version %}
- <small> {{ pkg_version }} </small>
+ <small class="text-muted"> {{ pkg_version }} </small>
{% endif %}
{% else %}
{% if build_id %}
diff --git a/frontend/coprs_frontend/coprs/templates/coprs/detail/package.html
b/frontend/coprs_frontend/coprs/templates/coprs/detail/package.html
index f3a45a3..584276f 100644
--- a/frontend/coprs_frontend/coprs/templates/coprs/detail/package.html
+++ b/frontend/coprs_frontend/coprs/templates/coprs/detail/package.html
@@ -1,5 +1,6 @@
{% extends "coprs/detail.html" %}
{% from "coprs/detail/_describe_source.html" import describe_source %}
+{% from "coprs/detail/_builds_table.html" import builds_table with context %}
{% block title %}Package {{ package.name }} in {{ package.copr.owner.name }}/{{
package.copr.name }}{% endblock %}
{%block project_breadcrumb %}
@@ -13,15 +14,28 @@
{% block detail_body %}
-<h2> {{ package.name }} </h2>
+<h2> Package: {{ package.name }} </h2>
<div class="row">
<div class="col-sm-8 col-md-9">
<dl class="dl-horizontal">
- <dt> Package Name:</dt>
+ {% if package.dist_git_url %}
+ <dt> Dist Git Repo:</dt>
<dd>
- {{package.name}}
+ <a href="{{package.dist_git_url}}">
+ {{package.dist_git_repo}}
+ </a>
</dd>
+ {% endif %}
</dl>
+ {#
+ <h3> Default Package Source </h3>
+ {{ describe_source(package) }}
+ #}
+ </div>
+ <div class="col-sm-12">
+ <h3> Recent Builds: </h3>
+ {{builds_table(package.builds)}}
</div>
</div>
+
{% endblock %}