Skip to content
Snippets Groups Projects
Commit fcd8822c authored by Roy Williams's avatar Roy Williams
Browse files

sorted out the admin

parent 06a78c6a
No related branches found
No related tags found
No related merge requests found
...@@ -19,7 +19,10 @@ class Command(BaseCommand): ...@@ -19,7 +19,10 @@ class Command(BaseCommand):
# create a log entry # create a log entry
eel = EMBBEventLog(event=event) eel = EMBBEventLog(event=event)
eel.event = event eel.event = event
eel.submitter = User.objects.get(username='roy.williams@LIGO.org') try:
eel.submitter = User.objects.get(username='roy.williams@LIGO.org')
except Exception, e:
print str(e)
# Assign a facility name # Assign a facility name
try: try:
......
...@@ -15,12 +15,15 @@ DATABASES = { ...@@ -15,12 +15,15 @@ DATABASES = {
'ENGINE' : 'django.db.backends.mysql', 'ENGINE' : 'django.db.backends.mysql',
'USER' : 'jkanner', 'USER' : 'jkanner',
'PASSWORD' : 'batman', 'PASSWORD' : 'batman',
'OPTIONS' : {
'init_command' : 'SET storage_engine=MyISAM',
}
} }
} }
ROOT_URLCONF = 'urls' ROOT_URLCONF = 'urls'
MEDIA_URL = "/gracedb-static/" #MEDIA_URL = "/gracedb-static/"
SKYMAP_VIEWER_MEDIA_URL = "/skymap-viewer/" SKYMAP_VIEWER_MEDIA_URL = "/skymap-viewer/"
...@@ -91,7 +94,7 @@ MIDDLEWARE_CLASSES = [ ...@@ -91,7 +94,7 @@ MIDDLEWARE_CLASSES = [
# 'ligodjangoauth.LigoShibbolethMiddleware', # 'ligodjangoauth.LigoShibbolethMiddleware',
'ligoauth.middleware.auth.LigoAuthMiddleware', 'ligoauth.middleware.auth.LigoAuthMiddleware',
'maintenancemode.middleware.MaintenanceModeMiddleware', 'maintenancemode.middleware.MaintenanceModeMiddleware',
'debug_toolbar.middleware.DebugToolbarMiddleware', # 'debug_toolbar.middleware.DebugToolbarMiddleware',
] ]
AUTHENTICATION_BACKENDS = ( AUTHENTICATION_BACKENDS = (
...@@ -130,7 +133,7 @@ INSTALLED_APPS = ( ...@@ -130,7 +133,7 @@ INSTALLED_APPS = (
'ligoauth', 'ligoauth',
'rest_framework', 'rest_framework',
'south', 'south',
'debug_toolbar', # 'debug_toolbar',
) )
INTERNAL_IPS = ( INTERNAL_IPS = (
...@@ -138,6 +141,7 @@ INTERNAL_IPS = ( ...@@ -138,6 +141,7 @@ INTERNAL_IPS = (
) )
LOGGING = {}
x = """ HACH HACK HACK x = """ HACH HACK HACK
LOG_ROOT = '/home/jkanner/logs' LOG_ROOT = '/home/jkanner/logs'
LOG_FILE_SIZE = 1024*1024 # 1 MB LOG_FILE_SIZE = 1024*1024 # 1 MB
......
...@@ -5,8 +5,8 @@ from django.conf.urls import patterns, url, include ...@@ -5,8 +5,8 @@ from django.conf.urls import patterns, url, include
from django.conf import settings from django.conf import settings
# Uncomment the next two lines to enable the admin: # Uncomment the next two lines to enable the admin:
#from django.contrib import admin from django.contrib import admin
#admin.autodiscover() admin.autodiscover()
from gracedb.feeds import EventFeed, feedview from gracedb.feeds import EventFeed, feedview
...@@ -43,7 +43,7 @@ urlpatterns = patterns('', ...@@ -43,7 +43,7 @@ urlpatterns = patterns('',
# to INSTALLED_APPS to enable admin documentation: # to INSTALLED_APPS to enable admin documentation:
# (r'^admin/doc/', include('django.contrib.admindocs.urls')), # (r'^admin/doc/', include('django.contrib.admindocs.urls')),
# url(r'^admin/', include(admin.site.urls)), url(r'^admin/', include(admin.site.urls)),
# For development only. And only for old Django versions (like 1.2) # For development only. And only for old Django versions (like 1.2)
(r'^gracedb-static/(?P<path>.*)$', 'django.views.static.serve', (r'^gracedb-static/(?P<path>.*)$', 'django.views.static.serve',
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment