Merge branch 'master' of gitlab.com:amfoss/cms

amfoss · May 20, 2021 · 1984674 · 1984674
2 parents 7a4beff + ec97383
commit 1984674
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 1 deletion.
diff --git a/activity/admin.py b/activity/admin.py
@@ -50,6 +50,7 @@ class CollectionAdmin(ImportExportModelAdmin, ExportActionMixin, admin.ModelAdmi
         ('Basic Details', {
             'fields': [
                 ('name', 'author','date'),
+                ('cover')
             ]
         }),
     ]

diff --git a/activity/models.py b/activity/models.py
@@ -19,10 +19,15 @@ def __str__(self):
         return self.name
 
 class Collection(models.Model):
+    def get_collection_poster_path(self, filename):
+        ext = filename.split('.')[-1]
+        filename = "%s.%s" % (uuid.uuid4(), ext)
+        return 'static/uploads/collections/cover/' + filename
     name = models.CharField(max_length=100)
     author = models.ForeignKey(User, on_delete=models.PROTECT, related_name='Collection_Author', blank=True, null=True)
     date = models.DateField(default=date.today)
-
+    cover = ProcessedImageField(default='', verbose_name='Collection Poster', upload_to=get_collection_poster_path, validators=[validate_file_size], **processed_image_field_specs)
+
     class Meta:
         verbose_name_plural = "Collections"
         verbose_name = "Collection"

diff --git a/activity/schema.py b/activity/schema.py
@@ -21,6 +21,7 @@ class CollectionTagObj(graphene.ObjectType):
     name = graphene.String()
     author = graphene.Field(UserBasicObj)
     date = graphene.Date(required=True)
+    cover = graphene.String(required=True)
 
     def resolve_name(self, info):
         return self['name']
@@ -30,6 +31,9 @@ def resolve_author(self, info):
 
     def resolve_date(self, info):
         return self['date']
+
+    def resolve_cover(self,info):
+        return self['cover']
 
 
 class TagObj(graphene.ObjectType):