diff options
Diffstat (limited to 'main')
| -rw-r--r-- | main/middleware.py | 16 | ||||
| -rw-r--r-- | main/models.py | 4 |
2 files changed, 1 insertions, 19 deletions
diff --git a/main/middleware.py b/main/middleware.py index 4d343b41..f893c795 100644 --- a/main/middleware.py +++ b/main/middleware.py @@ -1,19 +1,3 @@ -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): - user_holder.user = request.user - - -def get_user(): - '''Get the currently logged in request.user''' - return user_holder.user - # begin copy of stock Django UpdateCacheMiddleware # this is to address feeds caching issue which makes it horribly # unperformant diff --git a/main/models.py b/main/models.py index 7eeec854..793407e9 100644 --- a/main/models.py +++ b/main/models.py @@ -3,7 +3,6 @@ from django.db.models import Q from django.contrib.auth.models import User from django.contrib.sites.models import Site -from main.middleware import get_user from packages.models import PackageRelation ########################### @@ -121,8 +120,7 @@ class Donor(models.Model): class News(models.Model): id = models.AutoField(primary_key=True) - author = models.ForeignKey(User, related_name='news_author', - default=get_user) + author = models.ForeignKey(User, related_name='news_author') postdate = models.DateField(auto_now_add=True) title = models.CharField(max_length=255) content = models.TextField() |