diff --git a/archivist/apps/files/admin.py b/archivist/apps/files/admin.py index 186088d..2c18c6a 100644 --- a/archivist/apps/files/admin.py +++ b/archivist/apps/files/admin.py @@ -1,18 +1,10 @@ from django.contrib import admin -from .models import Submission_File, User_Profile_Images, User_Banner_Images +from .models import Submission_File # Register your models here. class Submission_FileAdmin(admin.ModelAdmin): list_display = ('file_name', 'date_added', 'file_hash', 'file',) -class User_Banner_ImagesAdmin(admin.ModelAdmin): - list_display = ('file_name', 'date_added', 'file_hash', 'file',) - -class User_Profile_ImagesAdmin(admin.ModelAdmin): - list_display = ('file_name', 'date_added', 'file_hash', 'file',) - -admin.site.register(Submission_File, Submission_FileAdmin) -admin.site.register(User_Banner_Images, User_Banner_ImagesAdmin) -admin.site.register(User_Profile_Images, User_Profile_ImagesAdmin) \ No newline at end of file +admin.site.register(Submission_File, Submission_FileAdmin) \ No newline at end of file diff --git a/archivist/apps/files/models.py b/archivist/apps/files/models.py index 2896513..7d1abbf 100644 --- a/archivist/apps/files/models.py +++ b/archivist/apps/files/models.py @@ -4,57 +4,14 @@ from django.utils.translation import gettext_lazy as _ # Create your models here. -def get_upload_to(instance, filename, folder): - return f'{folder}/{instance.file_hash[:2]}/{filename}' - -def get_upload_to_submission(instance, filename): - return get_upload_to(instance, filename, 'submissions') - -def get_upload_to_profile(instance, filename): - return get_upload_to(instance, filename, 'profiles') - -def get_upload_to_banner(instance, filename): - return get_upload_to(instance, filename, 'banners') - - -class User_Profile_Images(models.Model): - - file_hash = models.CharField(unique=True, max_length=64,) - file_name = models.CharField(max_length=150, blank=True) - file = models.FileField(upload_to=get_upload_to_profile, blank=True) - date_added = models.DateTimeField(auto_now_add=True, editable=True) - - class Meta: - verbose_name = _("User Profile Image") - verbose_name_plural = _("User Profile Images") - - def __str__(self): - return self.name - - #def get_absolute_url(self): - # return reverse("User_Profile_Image_detail", kwargs={"pk": self.pk}) - - -class User_Banner_Images(models.Model): - - file_hash = models.CharField(unique=True, max_length=64,) - file_name = models.CharField(max_length=150, blank=True) - file = models.FileField(upload_to=get_upload_to_banner, blank=True) - date_added = models.DateTimeField(auto_now_add=True, editable=True) - - class Meta: - verbose_name = _("User Banner Image") - verbose_name_plural = _("User Banner Images") - - def __str__(self): - return self.name - +def get_upload_to(instance, filename): + return f'submissions/{instance.file_hash[:2]}/{filename}' class Submission_File(models.Model): file_hash = models.CharField(unique=True, max_length=64,) file_name = models.CharField(max_length=150, blank=True) - file = models.FileField(upload_to=get_upload_to_submission, blank=True) + file = models.FileField(upload_to=get_upload_to, blank=True) date_added = models.DateTimeField(auto_now_add=True, editable=True) class Meta: diff --git a/archivist/apps/files/views.py b/archivist/apps/files/views.py index da14ff6..5445b88 100644 --- a/archivist/apps/files/views.py +++ b/archivist/apps/files/views.py @@ -73,7 +73,7 @@ def fileUpload(request): new_submission_file.save - return HttpResponseRedirect(f"/files/submission/{file_hash}") + return HttpResponseRedirect("/") else: form = UploadFileForm()