diff options
| author | substantialnoninfringinguser <substantialnoninfringinguser@gmail.com> | 2009-05-13 06:22:53 +0100 |
|---|---|---|
| committer | substantialnoninfringinguser <substantialnoninfringinguser@gmail.com> | 2009-05-13 06:22:53 +0100 |
| commit | 21204f1bc87f3f9d1f3972abcc5cf41bcb8d888b (patch) | |
| tree | 880ca19e5124d66a618871b338aa301a20f53813 /expo | |
| parent | 1b06243dabb7d88a2a89c0f37bd6fa69272a5bfa (diff) | |
| download | troggle-21204f1bc87f3f9d1f3972abcc5cf41bcb8d888b.tar.gz troggle-21204f1bc87f3f9d1f3972abcc5cf41bcb8d888b.tar.bz2 troggle-21204f1bc87f3f9d1f3972abcc5cf41bcb8d888b.zip | |
[svn] Fixes to deal with reorganization of expo surveys repository. Now that survey scans and Surveys.csv are in different directories, we have two settings variables, settings.SURVEYS for the root of the survey repo, and settings.SURVEY_SCANS for the surveyscans directory.
Fixed tab / indent muck in surveys parser. Commented out some "file abstraction" stuff for the time being.
Copied from http://cucc@cucc.survex.com/svn/trunk/expoweb/troggle/, rev. 8335 by cucc @ 5/10/2009 7:26 AM
Diffstat (limited to 'expo')
| -rw-r--r-- | expo/admin.py | 1 | ||||
| -rw-r--r-- | expo/models.py | 2 |
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
|