more changes, works ok. TODO: comments for git_wiki, redo git_browse...

1 files changed, 31 insertions, 20 deletions

diff --git a/bn_django/photos/models.py b/bn_django/photos/models.py
index 925f91b..e81ee3c 100644
--- a/bn_django/photos/models.py
+++ b/bn_django/photos/models.py
@@ -1,5 +1,5 @@
 from django.db import models
-from django.utils.translation import gettext_lazy as _
+from django.utils.translation import ugettext as _
 import django.contrib.auth.models as auth
 from django.conf import settings
 from django.dispatch import dispatcher
@@ -30,8 +30,8 @@ if ADMIN_URL[-1] == '/':
 
 # Create your models here.
 class Gallery(models.Model):
-    title = models.CharField(_("title"), maxlength=80)
-    slug = models.SlugField(prepopulate_from=("title",))
+    title = models.CharField(_("title"), max_length=80)
+    slug = models.SlugField()
     date = models.DateField(_("publication date"), auto_now_add=True)
     created = models.ForeignKey(auth.User,
                               verbose_name=_("gallery created by")
@@ -54,6 +54,7 @@ class Gallery(models.Model):
 
     class Admin:
         ordering = ['date']
+        prepopulated_fields = {'slug': 'title'}
 
     def __str__(self):
         return self.title
@@ -78,10 +79,10 @@ class Photo(models.Model):
     # import os, os.path, Image
     image = models.ImageField(_("Photograph"),
                             upload_to= STOCKPHOTO_BASE + "/%Y/%m/%d/")
-    title = models.CharField(_("title"), maxlength=80)
+    title = models.CharField(_("title"), max_length=80)
     desc = models.TextField(_("description"), blank=True)
     gallery = models.ForeignKey(Gallery)
-    photographer = models.CharField(_("photographer"), maxlength=80,
+    photographer = models.CharField(_("photographer"), max_length=80,
                                   blank=True)
     date = models.DateField(_("date photographed"), blank=True, null=True)
     extra = models.TextField(_("any extra information about the photo"),
@@ -128,14 +129,14 @@ class Photo(models.Model):
     def thumbpath(self):
         """Path to the thumbnail
         """
-        photobase = self.image[len(STOCKPHOTO_BASE)+1:]
+        photobase = self.image.name[len(STOCKPHOTO_BASE)+1:]
         return os.path.join( settings.MEDIA_ROOT, STOCKPHOTO_BASE,
                      "cache", "thumbs", photobase)
 
     def thumburl(self):
         """URL to the thumbnail
         """
-        photobase = self.image[len(STOCKPHOTO_BASE)+1:]
+        photobase = self.image.name[len(STOCKPHOTO_BASE)+1:]
         if settings.MEDIA_URL.endswith('/'):
             return settings.MEDIA_URL + STOCKPHOTO_BASE + \
                 "/cache/thumbs/" + photobase
@@ -144,12 +145,12 @@ class Photo(models.Model):
             
 
     def disppath(self):
-        photobase = self.image[len(STOCKPHOTO_BASE)+1:]
+        photobase = self.image.name[len(STOCKPHOTO_BASE)+1:]
         return os.path.join( settings.MEDIA_ROOT, STOCKPHOTO_BASE,
                          "cache", photobase)
 
     def dispurl(self):
-        photobase = self.image[len(STOCKPHOTO_BASE)+1:]
+        photobase = self.image.name[len(STOCKPHOTO_BASE)+1:]
         if settings.MEDIA_URL.endswith('/'):
             return settings.MEDIA_URL + STOCKPHOTO_BASE + "/cache/" \
                 + photobase
@@ -157,19 +158,19 @@ class Photo(models.Model):
             "/cache/" + photobase            
 
     def fullpath(self):
-        if self.image.startswith(os.path.sep):
-            return self.image
-        return os.path.join(settings.MEDIA_ROOT, self.image)
+        if self.image.name.startswith(os.path.sep):
+            return self.image.name
+        return os.path.join(settings.MEDIA_ROOT, self.image.name)
 
     def fullurl(self):
-        if self.image.startswith(os.path.sep):
+        if self.image.name.startswith(os.path.sep):
             # Shouldn't happen anymore
             return (settings.MEDIA_URL +
-                    self.image[len(settings.MEDIA_ROOT):])
+                    self.image.name[len(settings.MEDIA_ROOT):])
         else:
             if settings.MEDIA_URL.endswith('/'):
-                return settings.MEDIA_URL + self.image
-            return settings.MEDIA_URL + '/' + self.image
+                return settings.MEDIA_URL + self.image.name
+            return settings.MEDIA_URL + '/' + self.image.name
         
 
     def next(self):
@@ -280,7 +281,17 @@ def delete_thumbnails(sender, instance, signal, *args, **kwargs):
     """
     instance.delete_thumbnails()
 
-dispatcher.connect(build_display_images, signal=signals.post_save,
-                   sender=Photo) 
-dispatcher.connect(delete_thumbnails, signal=signals.pre_delete,
-                   sender=Photo)
+signals.post_save.connect(build_display_images, sender=Photo)
+signals.pre_delete.connect(delete_thumbnails, sender=Photo)
+
+#dispatcher.connect(build_display_images, signal=signals.post_save,
+#                   sender=Photo) 
+#dispatcher.connect(delete_thumbnails, signal=signals.pre_delete,
+#                   sender=Photo)
+
+
+from django.contrib import admin
+
+admin.site.register(Photo)
+admin.site.register(Gallery)
+