diff options
| -rw-r--r-- | main/middleware.py | 36 | ||||
| -rw-r--r-- | main/models.py | 2 |
2 files changed, 2 insertions, 36 deletions
diff --git a/main/middleware.py b/main/middleware.py index 1e70b245..db2c1104 100644 --- a/main/middleware.py +++ b/main/middleware.py @@ -1,43 +1,9 @@ -### -# Copyright (c) 2006-2007, Jared Kuolt -# All rights reserved. -# -# Redistribution and use in source and binary forms, with or without -# modification, are permitted provided that the following conditions are met: -# -# * Redistributions of source code must retain the above copyright notice, -# this list of conditions and the following disclaimer. -# * Redistributions in binary form must reproduce the above copyright -# notice, this list of conditions and the following disclaimer in the -# documentation and/or other materials provided with the distribution. -# * Neither the name of the SuperJared.com nor the names of its -# contributors may be used to endorse or promote products derived from -# this software without specific prior written permission. -# -# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" -# AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE -# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE -# ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE -# LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR -# CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF -# SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS -# INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN -# CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) -# ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE -# POSSIBILITY OF SUCH DAMAGE. -### - -from django.conf import settings -from django.contrib.auth.views import login -from django.http import HttpResponseRedirect -import re import threading - user_holder = threading.local() user_holder.user = None - +# http://code.djangoproject.com/wiki/CookBookThreadlocalsAndUser class AutoUserMiddleware(object): '''Saves the current user so it can be retrieved by the admin''' def process_request(self, request): diff --git a/main/models.py b/main/models.py index 066e0ee6..28041b1d 100644 --- a/main/models.py +++ b/main/models.py @@ -1,7 +1,7 @@ from django.db import models from django.db.models import Q from django.contrib.auth.models import User -from archweb.main.middleware import get_user +from main.middleware import get_user ########################### ### User Profile Class #### |