From eb75879a4632015b427d97ab945eaaa0bc26959a Mon Sep 17 00:00:00 2001
From: Sawyer Bergeron
Date: Fri, 1 Dec 2017 12:11:12 -0500
Subject: Add Dashboard OS Selection Menu on Booking
JIRA: PHAROS-326
Implement dropdown menu on pod booking page for user to
select base OS, as well as associated support in API and
pod status/booking status views
This patch includes the migration file mentioned by Parker Berbarian
Change-Id: I46a7b0e5e7020a89bc8fa0fe53c10bbda14a2e2d
Signed-off-by: Sawyer Bergeron
---
src/templates/booking/booking_calendar.html | 3 ++-
src/templates/booking/booking_detail.html | 5 ++++-
src/templates/booking/booking_table.html | 6 +++++-
3 files changed, 11 insertions(+), 3 deletions(-)
(limited to 'src/templates/booking')
diff --git a/src/templates/booking/booking_calendar.html b/src/templates/booking/booking_calendar.html
index 4644e85..16f0a4a 100644
--- a/src/templates/booking/booking_calendar.html
+++ b/src/templates/booking/booking_calendar.html
@@ -45,6 +45,7 @@
{% bootstrap_field form.end addon_after='' %}
+ {% bootstrap_field form.opsys %}
{% bootstrap_field form.purpose %}
{% bootstrap_field form.installer %}
{% bootstrap_field form.scenario %}
@@ -100,4 +101,4 @@
-{% endblock extrajs %}
\ No newline at end of file
+{% endblock extrajs %}
diff --git a/src/templates/booking/booking_detail.html b/src/templates/booking/booking_detail.html
index 4b016b2..cb937d3 100644
--- a/src/templates/booking/booking_detail.html
+++ b/src/templates/booking/booking_detail.html
@@ -18,9 +18,12 @@
Purpose: {{ booking.purpose }}
+
+ Operating System: {{ booking.opsys }}
+
Installer: {{ booking.installer }}
Scenario: {{ booking.scenario }}
-
\ No newline at end of file
+
diff --git a/src/templates/booking/booking_table.html b/src/templates/booking/booking_table.html
index 655b013..af2248c 100644
--- a/src/templates/booking/booking_table.html
+++ b/src/templates/booking/booking_table.html
@@ -7,6 +7,7 @@
Purpose |
Start |
End |
+ Operating System |
Installer |
Scenario |
@@ -26,6 +27,9 @@
{{ booking.end }}
|
+
+ {{ booking.opsys }}
+ |
{{ booking.installer }}
|
@@ -34,4 +38,4 @@
{% endfor %}
-
\ No newline at end of file
+
--
cgit 1.2.3-korg