Merge "Remove the Booking Notification Cleanup Task"

diff --git a/dashboard/src/account/rsa.pem b/dashboard/src/account/rsa.pem
deleted file mode 100644 (file)
index dbd4eed..0000000
--- a/dashboard/src/account/rsa.pem
+++ /dev/null
@@ -1,17 +0,0 @@
------BEGIN PRIVATE KEY-----
-MIICdgIBADANBgkqhkiG9w0BAQEFAASCAmAwggJcAgEAAoGBALRiMLAh9iimur8V
-A7qVvdqxevEuUkW4K+2KdMXmnQbG9Aa7k7eBjK1S+0LYmVjPKlJGNXHDGuy5Fw/d
-7rjVJ0BLB+ubPK8iA/Tw3hLQgXMRRGRXXCn8ikfuQfjUS1uZSatdLB81mydBETlJ
-hI6GH4twrbDJCR2Bwy/XWXgqgGRzAgMBAAECgYBYWVtleUzavkbrPjy0T5FMou8H
-X9u2AC2ry8vD/l7cqedtwMPp9k7TubgNFo+NGvKsl2ynyprOZR1xjQ7WgrgVB+mm
-uScOM/5HVceFuGRDhYTCObE+y1kxRloNYXnx3ei1zbeYLPCHdhxRYW7T0qcynNmw
-rn05/KO2RLjgQNalsQJBANeA3Q4Nugqy4QBUCEC09SqylT2K9FrrItqL2QKc9v0Z
-zO2uwllCbg0dwpVuYPYXYvikNHHg+aCWF+VXsb9rpPsCQQDWR9TT4ORdzoj+Nccn
-qkMsDmzt0EfNaAOwHOmVJ2RVBspPcxt5iN4HI7HNeG6U5YsFBb+/GZbgfBT3kpNG
-WPTpAkBI+gFhjfJvRw38n3g/+UeAkwMI2TJQS4n8+hid0uus3/zOjDySH3XHCUno
-cn1xOJAyZODBo47E+67R4jV1/gzbAkEAklJaspRPXP877NssM5nAZMU0/O/NGCZ+
-3jPgDUno6WbJn5cqm8MqWhW1xGkImgRk+fkDBquiq4gPiT898jusgQJAd5Zrr6Q8
-AO/0isr/3aa6O6NLQxISLKcPDk2NOccAfS/xOtfOz4sJYM3+Bs4Io9+dZGSDCA54
-Lw03eHTNQghS0A==
------END PRIVATE KEY-----
-

diff --git a/dashboard/src/account/rsa.pub b/dashboard/src/account/rsa.pub
deleted file mode 100644 (file)
index cc50e45..0000000
--- a/dashboard/src/account/rsa.pub
+++ /dev/null
@@ -1,6 +0,0 @@
------BEGIN PUBLIC KEY-----
-MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQC0YjCwIfYoprq/FQO6lb3asXrx
-LlJFuCvtinTF5p0GxvQGu5O3gYytUvtC2JlYzypSRjVxwxrsuRcP3e641SdASwfr
-mzyvIgP08N4S0IFzEURkV1wp/IpH7kH41EtbmUmrXSwfNZsnQRE5SYSOhh+LcK2w
-yQkdgcMv11l4KoBkcwIDAQAB
------END PUBLIC KEY-----

diff --git a/dashboard/src/booking/forms.py b/dashboard/src/booking/forms.py
index b4acd8f..9d71b42 100644 (file)
--- a/dashboard/src/booking/forms.py
+++ b/dashboard/src/booking/forms.py
@@ -21,6 +21,7 @@ class BookingForm(forms.Form):
     reset = forms.ChoiceField(choices = ((True, 'Yes'),(False, 'No')), label="Reset System", initial='False', required=False)
     purpose = forms.CharField(max_length=300)
     opsys = forms.ModelChoiceField(queryset=Opsys.objects.all(), required=False)
+    opsys.label = "Operating System"
     installer = forms.ModelChoiceField(queryset=Installer.objects.all(), required=False)
     scenario = forms.ModelChoiceField(queryset=Scenario.objects.all(), required=False)
 

diff --git a/dashboard/src/pharos_dashboard/settings.py b/dashboard/src/pharos_dashboard/settings.py
index 240f68e..361c4a1 100644 (file)
--- a/dashboard/src/pharos_dashboard/settings.py
+++ b/dashboard/src/pharos_dashboard/settings.py
@@ -5,7 +5,9 @@ from datetime import timedelta
 BASE_DIR = os.path.dirname(os.path.dirname(os.path.abspath(__file__)))
 
 # SECURITY WARNING: don't run with debug turned on in production!
-DEBUG = True
+# NOTE: os.environ only returns strings, so making a comparison to
+# 'True' here will convert it to the correct Boolean value.
+DEBUG = os.environ['DEBUG'] == 'True'
 
 # Application definition
 

diff --git a/dashboard/src/templates/account/user_list.html b/dashboard/src/templates/account/user_list.html
index 68178eb..58ddda6 100644 (file)
--- a/dashboard/src/templates/account/user_list.html
+++ b/dashboard/src/templates/account/user_list.html
@@ -22,7 +22,7 @@
                 {{ user.userprofile.full_name }}
             </td>
             <td>
-                {{ user.email }}
+                {{ user.userprofile.email_addr }}
             </td>
             <td>
                 {{ user.userprofile.company }}