Repository :
http://git.fedorahosted.org/cgit/copr.git
On branch : master
---------------------------------------------------------------
commit 838d31deee083bd7de11cf166e53ffd89245912b
Author: Adam Samalik <asamalik(a)redhat.com>
Date: Thu Jul 30 16:55:22 2015 +0200
[frontend] add importing queue
---------------------------------------------------------------
.../coprs_frontend/coprs/templates/coprs/show.html | 4 ++++
.../coprs_frontend/coprs/templates/status.html | 3 +++
.../status/{waiting.html => importing.html} | 10 +++-------
.../coprs/views/coprs_ns/coprs_general.py | 6 ++++++
.../coprs/views/status_ns/status_general.py | 9 +++++++++
5 files changed, 25 insertions(+), 7 deletions(-)
diff --git a/frontend/coprs_frontend/coprs/templates/coprs/show.html
b/frontend/coprs_frontend/coprs/templates/coprs/show.html
index fc8596e..350173a 100644
--- a/frontend/coprs_frontend/coprs/templates/coprs/show.html
+++ b/frontend/coprs_frontend/coprs/templates/coprs/show.html
@@ -61,6 +61,10 @@
<h3 class="panel-title"> Task Queue </h3>
</div>
<div class="list-group">
+ <a href="{{url_for('status_ns.importing')}}"
class="list-group-item">
+ <span class="badge">{{importing_tasks}}</span>
+ Importing
+ </a>
<a href="{{url_for('status_ns.waiting')}}"
class="list-group-item">
<span class="badge">{{waiting_tasks}}</span>
Waiting
diff --git a/frontend/coprs_frontend/coprs/templates/status.html
b/frontend/coprs_frontend/coprs/templates/status.html
index cabb9f1..c477e4b 100644
--- a/frontend/coprs_frontend/coprs/templates/status.html
+++ b/frontend/coprs_frontend/coprs/templates/status.html
@@ -14,6 +14,9 @@
</ol>
<h1> Task queue </h1>
<ul class="nav nav-tabs">
+ <li class="{% block importing_selected %}{% endblock %}">
+ <a href="{{ url_for('status_ns.importing')
}}">Importing</a>
+ </li>
<li class="{% block waiting_selected %}{% endblock %}">
<a href="{{ url_for('status_ns.waiting')
}}">Waiting</a>
</li>
diff --git a/frontend/coprs_frontend/coprs/templates/status/waiting.html
b/frontend/coprs_frontend/coprs/templates/status/importing.html
similarity index 84%
copy from frontend/coprs_frontend/coprs/templates/status/waiting.html
copy to frontend/coprs_frontend/coprs/templates/status/importing.html
index e1d34e5..c69c2bc 100644
--- a/frontend/coprs_frontend/coprs/templates/status/waiting.html
+++ b/frontend/coprs_frontend/coprs/templates/status/importing.html
@@ -1,8 +1,8 @@
{% extends "status.html" %}
-{% block waiting_selected %}active{% endblock %}
+{% block importing_selected %}active{% endblock %}
{%block status_breadcrumb %}
<li class="active">
- Waiting
+ Importing
</li>
{%endblock%}
{% block status_body %}
@@ -13,7 +13,7 @@
{%else%}
{{number}} tasks
{%endif%}
- are waiting
+ are being imported
</h2>
<table class="table table-striped table-bordered">
@@ -30,11 +30,7 @@
{% for task in tasks %}
<tr>
<td>
- {% if task.state == "starting" %}
- <span class="build-starting">starting</span>
- {% else %}
{{ task.build.submitted_on | time_ago }}
- {% endif %}
</td>
<td><a href="{{ url_for('coprs_ns.copr_detail', username =
task.build.copr.owner.name, coprname = task.build.copr.name)
}}">{{task.build.copr.owner.name}}/{{task.build.copr.name}}</a></td>
<td><a href="{{ url_for('coprs_ns.copr_build', username =
task.build.copr.owner.name, coprname = task.build.copr.name, build_id = task.build_id)
}}">{{task.build_id}}</a></td>
diff --git a/frontend/coprs_frontend/coprs/views/coprs_ns/coprs_general.py
b/frontend/coprs_frontend/coprs/views/coprs_ns/coprs_general.py
index 8d8e906..26dcf5e 100644
--- a/frontend/coprs_frontend/coprs/views/coprs_ns/coprs_general.py
+++ b/frontend/coprs_frontend/coprs/views/coprs_ns/coprs_general.py
@@ -44,12 +44,15 @@ def coprs_show(page=1):
waiting_tasks = len(list(builds_logic.BuildsLogic.get_build_task_queue()))
running_tasks = len(list(builds_logic.BuildsLogic
.get_build_tasks(helpers.StatusEnum("running"))))
+ importing_tasks = len(list(builds_logic.BuildsLogic
+
.get_build_tasks(helpers.StatusEnum("importing"))))
return flask.render_template("coprs/show/all.html",
coprs=coprs,
paginator=paginator,
waiting_tasks=waiting_tasks,
running_tasks=running_tasks,
+ importing_tasks=importing_tasks,
users_builds=users_builds)
@@ -73,6 +76,8 @@ def coprs_by_owner(username=None, page=1):
waiting_tasks = len(list(builds_logic.BuildsLogic.get_build_task_queue()))
running_tasks = len(list(builds_logic.BuildsLogic
.get_build_tasks(helpers.StatusEnum("running"))))
+ importing_tasks = len(list(builds_logic.BuildsLogic
+
.get_build_tasks(helpers.StatusEnum("importing"))))
return flask.render_template("coprs/show/user.html",
user=user,
@@ -80,6 +85,7 @@ def coprs_by_owner(username=None, page=1):
paginator=paginator,
waiting_tasks=waiting_tasks,
running_tasks=running_tasks,
+ importing_tasks=importing_tasks,
users_builds=users_builds)
diff --git a/frontend/coprs_frontend/coprs/views/status_ns/status_general.py
b/frontend/coprs_frontend/coprs/views/status_ns/status_general.py
index add0359..58301d0 100644
--- a/frontend/coprs_frontend/coprs/views/status_ns/status_general.py
+++ b/frontend/coprs_frontend/coprs/views/status_ns/status_general.py
@@ -21,3 +21,12 @@ def running():
return flask.render_template("status/running.html",
number=len(list(tasks)),
tasks=tasks)
+
+
+(a)status_ns.route("/importing/")
+def importing():
+ tasks = builds_logic.BuildsLogic.get_build_tasks(
+ helpers.StatusEnum("importing")).limit(200)
+ return flask.render_template("status/importing.html",
+ number=len(list(tasks)),
+ tasks=tasks)