summaryrefslogtreecommitdiffstats
path: root/dashboard
diff options
context:
space:
mode:
Diffstat (limited to 'dashboard')
-rw-r--r--dashboard/src/booking/forms.py1
-rw-r--r--dashboard/src/pharos_dashboard/settings.py4
-rw-r--r--dashboard/src/templates/account/user_list.html2
3 files changed, 5 insertions, 2 deletions
diff --git a/dashboard/src/booking/forms.py b/dashboard/src/booking/forms.py
index b4acd8f..9d71b42 100644
--- 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
--- 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
--- 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 }}