summaryrefslogtreecommitdiff
path: root/devel/views.py
diff options
context:
space:
mode:
authorLuke Shumaker <lukeshu@sbcglobal.net>2014-10-02 20:40:34 -0400
committerLuke Shumaker <lukeshu@sbcglobal.net>2014-10-02 20:40:34 -0400
commitea00a099dffd7157c93af54b5817734348d2bbc6 (patch)
tree89fa4ba0c0ac19a4286ba4c4cb64f77536b1a098 /devel/views.py
parent1a1fd4a3d6aa7f6b2338f7751f5f97a30a059a04 (diff)
parent0f0ce18109f8104d7b2abe9024ef26fa07ff0292 (diff)
Merge branch 'archweb' into archweb-generic
Conflicts: templates/public/download.html templates/public/index.html
Diffstat (limited to 'devel/views.py')
-rw-r--r--devel/views.py2
1 files changed, 2 insertions, 0 deletions
diff --git a/devel/views.py b/devel/views.py
index 972d0abb..92cb098e 100644
--- a/devel/views.py
+++ b/devel/views.py
@@ -5,6 +5,7 @@ import time
from django.http import HttpResponseRedirect
from django.contrib.auth.decorators import \
login_required, permission_required, user_passes_test
+from django.contrib import admin
from django.contrib.admin.models import LogEntry, ADDITION
from django.contrib.auth.models import User
from django.contrib.contenttypes.models import ContentType
@@ -259,6 +260,7 @@ def admin_log(request, username=None):
'title': "Admin Action Log",
'log_user': user,
}
+ context.update(admin.site.each_context())
return render(request, 'devel/admin_log.html', context)
# vim: set ts=4 sw=4 et: