summaryrefslogtreecommitdiffstats
path: root/expo
diff options
context:
space:
mode:
Diffstat (limited to 'expo')
-rw-r--r--expo/admin.py1
-rw-r--r--expo/models.py2
2 files changed, 2 insertions, 1 deletions
diff --git a/expo/admin.py b/expo/admin.py
index 4416dda..f2717d9 100644
--- a/expo/admin.py
+++ b/expo/admin.py
@@ -24,6 +24,7 @@ class ScannedImageInline(admin.TabularInline):
class SurveyAdmin(TroggleModelAdmin):
inlines = (ScannedImageInline,)
+ search_fields = ('expedition__year','wallet_number')
class QMInline(admin.TabularInline):
model=QM
diff --git a/expo/models.py b/expo/models.py
index 639e8b5..b7ad2d7 100644
--- a/expo/models.py
+++ b/expo/models.py
@@ -538,7 +538,7 @@ class Photo(TroggleModel):
def __str__(self):
return self.caption
-scansFileStorage = FileSystemStorage(location=settings.SURVEYS, base_url=settings.SURVEYS_URL)
+scansFileStorage = FileSystemStorage(location=settings.SURVEY_SCANS, base_url=settings.SURVEYS_URL)
def get_scan_path(instance, filename):
year=instance.survey.expedition.year
print "WN: ", type(instance.survey.wallet_number), instance.survey.wallet_number