Skip to content

Commit

Permalink
Whitespace cleanup, model title, minor version release.
Browse files Browse the repository at this point in the history
  • Loading branch information
issackelly committed Sep 16, 2012
1 parent 127b3fd commit 5f8940e
Show file tree
Hide file tree
Showing 2 changed files with 21 additions and 15 deletions.
2 changes: 1 addition & 1 deletion servee_gallery/__init__.py
@@ -1 +1 @@
__version__ = "0.2"
__version__ = "0.2.1"
34 changes: 20 additions & 14 deletions servee_gallery/models.py
Expand Up @@ -5,27 +5,33 @@

class BaseGallery(models.Model):
"""
BaseGallery
BaseGallery
"""
title = models.CharField(max_length=256, blank=True, null=True)
slug = models.SlugField(max_length=128, blank=True, null=True)
description = models.TextField(blank=True, null=True)
created = models.DateTimeField(blank=True)
modified = models.DateTimeField(blank=True)

def save(self, *args, **kwargs):
self.modified = datetime.datetime.now()

if not self.slug:
self.slug = slugify(self.title)

if not self.created:
self.created = datetime.datetime.now()
super(BaseGallery, self).save(*args, **kwargs) # Call the "real" save() method.

class Meta:
abstract = True

def __unicode__(self):
if self.title:
return self.title
else:
return u"Gallery #%s" % self.id

class Gallery(BaseGallery):
"""
Non-Abstract Gallery Model
Expand All @@ -46,40 +52,40 @@ class BaseGalleryItem(models.Model):

def __unicode__(self):
return "%s" % self.title

def save(self, *args, **kwargs):
self.modified = datetime.datetime.now()

# update gallery modified time
self.gallery.modified = datetime.datetime.now()
self.gallery.save()

if not self.uploaded:
self.uploaded = datetime.datetime.now()
super(BaseGalleryItem, self).save(*args, **kwargs) # Call the "real" save() method.

def get_absolute_url(self):
return self.item.url

class Meta:
abstract = True
ordering = ("gallery", "order")

class Image(BaseGalleryItem):
"""
"""
image = models.ImageField(
upload_to=IMAGE_UPLOAD_TO,
storage=DEFAULT_STORAGE()
)

def save(self, *args, **kwargs):
# create a title if the galleritem has a name
if not self.title:
self.title = self.image.name
super(Image, self).save(*args, **kwargs) # Call the "real" save() method.
class Meta:

class Meta:
verbose_name = "servee gallery image"
verbose_name_plural = "servee gallery images"
ordering = ["modified",]
ordering = ["modified",]

0 comments on commit 5f8940e

Please sign in to comment.