git.ithinksw.org
/
philo.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'sobol-templates-hotfix' into release
[philo.git]
/
philo
/
contrib
/
sobol
/
admin.py
diff --git
a/philo/contrib/sobol/admin.py
b/philo/contrib/sobol/admin.py
index
87dd39a
..
f4636e7
100644
(file)
--- a/
philo/contrib/sobol/admin.py
+++ b/
philo/contrib/sobol/admin.py
@@
-1,3
+1,5
@@
+from functools import update_wrapper
+
from django.conf import settings
from django.conf.urls.defaults import patterns, url
from django.contrib import admin
from django.conf import settings
from django.conf.urls.defaults import patterns, url
from django.contrib import admin
@@
-7,9
+9,9
@@
from django.http import HttpResponseRedirect, Http404
from django.shortcuts import render_to_response
from django.template import RequestContext
from django.utils.translation import ugettext_lazy as _
from django.shortcuts import render_to_response
from django.template import RequestContext
from django.utils.translation import ugettext_lazy as _
+
from philo.admin import EntityAdmin
from philo.contrib.sobol.models import Search, ResultURL, SearchView
from philo.admin import EntityAdmin
from philo.contrib.sobol.models import Search, ResultURL, SearchView
-from functools import update_wrapper
class ResultURLInline(admin.TabularInline):
class ResultURLInline(admin.TabularInline):