Repository :
http://git.fedorahosted.org/cgit/copr.git
On branch : master
---------------------------------------------------------------
commit 2516fa8f4642086a18c5842d098e592adc75e883
Author: Adam Samalik <asamalik(a)redhat.com>
Date: Wed Jul 2 09:12:43 2014 +0200
[frontend] skipped state support
---------------------------------------------------------------
frontend/coprs_frontend/coprs/helpers.py | 3 ++-
.../coprs_frontend/coprs/logic/builds_logic.py | 3 ++-
frontend/coprs_frontend/coprs/models.py | 2 +-
frontend/coprs_frontend/coprs/static/copr.css | 8 ++++++++
frontend/coprs_frontend/coprs/templates/api.html | 2 ++
5 files changed, 15 insertions(+), 3 deletions(-)
diff --git a/frontend/coprs_frontend/coprs/helpers.py
b/frontend/coprs_frontend/coprs/helpers.py
index 7da895d..bb26265 100644
--- a/frontend/coprs_frontend/coprs/helpers.py
+++ b/frontend/coprs_frontend/coprs/helpers.py
@@ -62,7 +62,8 @@ class StatusEnum(object):
"succeeded": 1,
"canceled": 2,
"running": 3,
- "pending": 4}
+ "pending": 4,
+ "skipped": 5} # if there was this package built already
class Paginator(object):
diff --git a/frontend/coprs_frontend/coprs/logic/builds_logic.py
b/frontend/coprs_frontend/coprs/logic/builds_logic.py
index b665b10..2bd7b41 100644
--- a/frontend/coprs_frontend/coprs/logic/builds_logic.py
+++ b/frontend/coprs_frontend/coprs/logic/builds_logic.py
@@ -187,7 +187,8 @@ class BuildsLogic(object):
last_build = (builds
.join(models.BuildChroot)
- .filter(models.BuildChroot.status ==
helpers.StatusEnum("succeeded"))
+ .filter((models.BuildChroot.status ==
helpers.StatusEnum("succeeded"))
+ or (models.BuildChroot.status ==
helpers.StatusEnum("skipped")))
.filter(models.Build.ended_on != None)
.order_by(models.Build.ended_on.desc())
).first()
diff --git a/frontend/coprs_frontend/coprs/models.py
b/frontend/coprs_frontend/coprs/models.py
index 2909f9c..601a7b0 100644
--- a/frontend/coprs_frontend/coprs/models.py
+++ b/frontend/coprs_frontend/coprs/models.py
@@ -274,7 +274,7 @@ class Build(db.Model, helpers.Serializer):
if self.canceled:
return helpers.StatusEnum("canceled")
- for state in ["failed", "running", "pending",
"succeeded"]:
+ for state in ["failed", "running", "pending",
"succeeded", "skipped"]:
if helpers.StatusEnum(state) in self.chroot_states:
return helpers.StatusEnum(state)
diff --git a/frontend/coprs_frontend/coprs/static/copr.css
b/frontend/coprs_frontend/coprs/static/copr.css
index baa56ef..8fb91e9 100644
--- a/frontend/coprs_frontend/coprs/static/copr.css
+++ b/frontend/coprs_frontend/coprs/static/copr.css
@@ -331,6 +331,10 @@ tr.build-row-succeeded {
color: black;
}
+tr.build-row-skipped {
+ color: black;
+}
+
.build-pending {
color: #55b;
}
@@ -343,6 +347,10 @@ tr.build-row-succeeded {
color: #272;
}
+.build-skipped {
+ color: #272;
+}
+
.build-failed {
color: #c44;
}
diff --git a/frontend/coprs_frontend/coprs/templates/api.html
b/frontend/coprs_frontend/coprs/templates/api.html
index 0424c06..8b9ef57 100644
--- a/frontend/coprs_frontend/coprs/templates/api.html
+++ b/frontend/coprs_frontend/coprs/templates/api.html
@@ -241,6 +241,7 @@ copr_url =
https://copr.fedoraproject.org
<li>running</li>
<li>failed</li>
<li>succeeded</li>
+ <li>skipped</li>
<li>canceled</li>
</ul>
</li>
@@ -272,6 +273,7 @@ copr_url =
https://copr.fedoraproject.org
<li>running</li>
<li>failed</li>
<li>succeeded</li>
+ <li>skipped</li>
<li>canceled</li>
</ul>
</li>