From c06585b3e82772fb6e1669fff70b33e63dd4d19f Mon Sep 17 00:00:00 2001
From: substantialnoninfringinguser <substantialnoninfringinguser@gmail.com>
Date: Wed, 13 May 2009 05:22:26 +0100
Subject: [PATCH] [svn] Remove MEDIA_ROOT from settings.py because it belongs
in local settings, and comment out urlconf line for unfinished edit form
which I haven't checked in. Copied from
http://cucc@cucc.survex.com/svn/trunk/expoweb/troggle/, rev. 8082 by aaron @
12/8/2008 5:10 AM
---
settings.py | 1 -
urls.py | 2 +-
2 files changed, 1 insertion(+), 2 deletions(-)
diff --git a/settings.py b/settings.py
index 2dd7cc0..11e9073 100644
--- a/settings.py
+++ b/settings.py
@@ -30,7 +30,6 @@ USE_I18N = True
# Absolute path to the directory that holds media.
# Example: "/home/media/media.lawrence.com/"
# MOVED TO LOCALSETTINGS
-MEDIA_ROOT = 'C:/Expo/expoweb/troggle/media/'
# URL that handles the media served from MEDIA_ROOT. Make sure to use a
# trailing slash if there is a path component (optional in other cases).
diff --git a/urls.py b/urls.py
index 0afaa3b..739b29a 100644
--- a/urls.py
+++ b/urls.py
@@ -9,7 +9,7 @@ urlpatterns = patterns('',
(r'^cave/$', caveindex),
(r'^cave/(?P<cave_id>[^/]+)/$', cave),
(r'^cave/(?P<cave_id>[^/]+)/(?P<ent_letter>[^/]?)$', ent),
- (r'^cave/(?P<cave_id>[^/]+)/edit/$', edit_cave),
+ #(r'^cave/(?P<cave_id>[^/]+)/edit/$', edit_cave),
(r'^cavesearch/$', caveSearch),
(r'^survex/(?P<survex_file>.*)\.index$', index),