From b6244a271cff1e36bf7f421f68dce688c7d4b8b7 Mon Sep 17 00:00:00 2001
From: Branson Stephens <stephenb@uwm.edu>
Date: Fri, 16 Nov 2012 08:42:05 -0600
Subject: [PATCH] bringing settings into line and fixing auth middleware bug
---
gracedb/middleware/auth.py | 2 +-
settings/default.py | 9 ++++-----
2 files changed, 5 insertions(+), 6 deletions(-)
diff --git a/gracedb/middleware/auth.py b/gracedb/middleware/auth.py
index dd5f4d532..9e83a85f5 100644
--- a/gracedb/middleware/auth.py
+++ b/gracedb/middleware/auth.py
@@ -20,7 +20,7 @@ class LigoAuthMiddleware:
user = None
queryResult = []
- if (request.user):
+ if not request.user.is_anonymous():
# Scott's middleware has set the user aready using shib.
# Let's add some more attributes.
principal = request.user.username
diff --git a/settings/default.py b/settings/default.py
index b2eb5eb71..593cb21cf 100644
--- a/settings/default.py
+++ b/settings/default.py
@@ -54,9 +54,9 @@ SKYALERT_DESCRIPTION = "LIGO / Virgo trigger"
SKYALERT_SUBMITTERS = ['Patrick Brady', 'Brian Moe']
-#GRACEDB_DATA_DIR = "/mnt/gracedb-web/data"
+GRACEDB_DATA_DIR = "/mnt/gracedb-web/data"
#GRACEDB_DATA_DIR = "/mnt/gracedb-web-temp/data"
-GRACEDB_DATA_DIR = "/home/branson/fake_data"
+#GRACEDB_DATA_DIR = "/home/branson/fake_data"
# Latency histograms. Where they go and max latency to bin.
LATENCY_REPORT_DEST_DIR = "/home/gracedb/data/latency"
@@ -132,8 +132,7 @@ MEDIA_URL = '/gracedb-static/'
# URL prefix for admin media -- CSS, JavaScript and images. Make sure to use a
# trailing slash.
# Examples: "http://foo.com/media/", "/media/".
-#ADMIN_MEDIA_PREFIX = '/media/'
-STATIC_URL = '/media/'
+ADMIN_MEDIA_PREFIX = '/media/'
# Make this unique, and don't share it with anybody.
SECRET_KEY = '$$&hl%^_4&s0k7sbdr8ll_^gkz-j8oab0tz$t^^b-%$!83d(av'
@@ -143,7 +142,7 @@ TEMPLATE_LOADERS = (
#'django.template.loaders.filesystem.load_template_source',
# replaced by...
'django.template.loaders.filesystem.Loader',
-# 'django.template.loaders.app_directories.load_template_source',
+ 'django.template.loaders.app_directories.load_template_source',
# 'django.template.loaders.eggs.load_template_source',
)
--
GitLab