Merge branch 'develop' into feature/supporter

digitalglarus/models.py

@@ -18,7 +18,7 @@ class Message(models.Model):
 class Supporter(models.Model):
     name = models.CharField(max_length=200)
     description = models.TextField(null=True, blank=True)
-
+    
     def __str__(self):
         return "%s" % (self.name)
 
@@ -39,16 +39,36 @@ class Supporter(models.Model):
 #     class Meta:
 #         verbose_name_plural = 'dgGallery'
 
-# class DGPicture(models.Model):
-#     gallery = models.ForeignKey(DGGallery)
-#     image =  FilerImageField(related_name='dg_gallery')
-#     description = models.CharField(max_length=60)
+    def __str__(self):
+        return "%s" % (self.name)
+
+    def get_absolute_url(self):
+        return reverse('dgSupporters_view', args=[self.pk])
+
+
+class DGGallery(models.Model):
+    parent = models.ForeignKey('self', blank=True, null=True)
+    name = models.CharField(max_length=30)
+
+    def __str__(self):
+        return "%s" % (self.name)
+
+    def get_absolute_url(self):
+        return reverse('dgGallery_view', args=[self.pk])
+
+    class Meta:
+        verbose_name_plural = 'dgGallery'
 #
-#     def __str__(self):
-#         return "%s" % (self.image.name)
-#
-# class DGGalleryPlugin(CMSPlugin):
-#     dgGallery = models.ForeignKey(DGGallery)
-#
-# class DGSupportersPlugin(CMSPlugin):
-#     pass
+class DGPicture(models.Model):
+    gallery = models.ForeignKey(DGGallery)
+    image =  FilerImageField(related_name='dg_gallery')
+    description = models.CharField(max_length=60)
+
+    def __str__(self):
+        return "%s" % (self.image.name)
+
+class DGGalleryPlugin(CMSPlugin):
+    dgGallery = models.ForeignKey(DGGallery)
+
+class DGSupportersPlugin(CMSPlugin):
+    pass