summaryrefslogtreecommitdiffstats
path: root/tools/pharos-dashboard/dashboard/templatetags
diff options
context:
space:
mode:
authormaxbr <maxbr@mi.fu-berlin.de>2016-08-25 12:10:55 +0200
committermaxbr <maxbr@mi.fu-berlin.de>2016-08-25 12:10:55 +0200
commitb67557fdf3ddab95d2834c8aa01dcc0d120685dd (patch)
tree20e4ab79342e26b4f6f8d7c83be1cb5989d08392 /tools/pharos-dashboard/dashboard/templatetags
parent4ef923cbe9d4d4f3348657389661ffa99e89f919 (diff)
Add a Resource detail view
JIRA: RELENG-12 The resource page contains an utilization diagram, future bookings with their jira tickets and a list of servers. Change-Id: I2123ccbe96cde29a56af32b933ebbf6ba2668ed1 Signed-off-by: maxbr <maxbr@mi.fu-berlin.de>
Diffstat (limited to 'tools/pharos-dashboard/dashboard/templatetags')
-rw-r--r--tools/pharos-dashboard/dashboard/templatetags/jenkins_filters.py7
-rw-r--r--tools/pharos-dashboard/dashboard/templatetags/jira_filters.py8
2 files changed, 12 insertions, 3 deletions
diff --git a/tools/pharos-dashboard/dashboard/templatetags/jenkins_filters.py b/tools/pharos-dashboard/dashboard/templatetags/jenkins_filters.py
index f7e00a87..f5038ea5 100644
--- a/tools/pharos-dashboard/dashboard/templatetags/jenkins_filters.py
+++ b/tools/pharos-dashboard/dashboard/templatetags/jenkins_filters.py
@@ -9,7 +9,7 @@ def jenkins_job_color(job_result):
return '#d9534f'
if job_result == 'UNSTABLE':
return '#EDD62B'
- return '#646F73' # job is still building
+ return '#646F73' # job is still building
@register.filter
@@ -21,7 +21,8 @@ def jenkins_status_color(slave_status):
if slave_status == 'online / idle':
return '#5bc0de'
+
@register.filter
def jenkins_job_blink(job_result):
- if job_result == '': # job is still building
- return 'class=blink_me' \ No newline at end of file
+ if job_result == '': # job is still building
+ return 'class=blink_me'
diff --git a/tools/pharos-dashboard/dashboard/templatetags/jira_filters.py b/tools/pharos-dashboard/dashboard/templatetags/jira_filters.py
new file mode 100644
index 00000000..d9c27612
--- /dev/null
+++ b/tools/pharos-dashboard/dashboard/templatetags/jira_filters.py
@@ -0,0 +1,8 @@
+from django.template.defaultfilters import register
+
+from pharos_dashboard import settings
+
+
+@register.filter
+def jira_issue_url(issue):
+ return settings.JIRA_URL + '/browse/' + str(issue)