Skip to content
Browse files

switched models to use "folders" field instead of "folder" field

  • Loading branch information...
1 parent aaf7fd3 commit cbdb81035174b2bb1eea58d2508991fb793cfef2 @trey0 trey0 committed Jul 5, 2011
Showing with 3 additions and 3 deletions.
  1. +1 −2 geocamLens/bin/simpleImport.py
  2. +2 −1 geocamLens/models.py
View
3 geocamLens/bin/simpleImport.py
@@ -76,8 +76,7 @@ def importDir(opts, dir, uploadClient):
folderName = os.path.basename(dir)
if not opts.upload:
- folder, created = Folder.objects.get_or_create(name=folderName,
- defaults=dict(timeZone=timeZone))
+ folder, created = Folder.objects.get_or_create(name=folderName)
photosToUpload = []
View
3 geocamLens/models.py
@@ -252,7 +252,8 @@ def getUploadImageFormVals(self, formData):
if folder == None:
folder = coreModels.Folder.objects.get(id=1)
- tz = pytz.timezone(folder.timeZone)
+ # FIX figure out what time zone to show
+ tz = pytz.timezone(settings.TIME_ZONE)
timestampStr = Xmp.checkMissing(formData.get('cameraTime', None))
if timestampStr == None:
timestampUtc = None

0 comments on commit cbdb810

Please sign in to comment.
Something went wrong with that request. Please try again.