diff --git a/physionet-django/project/admin.py b/physionet-django/project/admin.py index eb465c03b..89cca3361 100644 --- a/physionet-django/project/admin.py +++ b/physionet-django/project/admin.py @@ -100,7 +100,6 @@ def get_queryset(self, request): admin.site.register(models.Reference) admin.site.register(models.Topic) admin.site.register(models.Affiliation) -admin.site.register(models.ArchivedProject) admin.site.register(models.Contact) admin.site.register(models.ContentType) admin.site.register(models.CopyeditLog) diff --git a/physionet-django/project/modelcomponents/archivedproject.py b/physionet-django/project/modelcomponents/archivedproject.py deleted file mode 100644 index 5037c3a0b..000000000 --- a/physionet-django/project/modelcomponents/archivedproject.py +++ /dev/null @@ -1,32 +0,0 @@ -import os - -from django.conf import settings -from django.db import models - -from project.modelcomponents.metadata import Metadata -from project.modelcomponents.unpublishedproject import UnpublishedProject -from project.modelcomponents.submission import SubmissionInfo - - -class ArchivedProject(Metadata, UnpublishedProject, SubmissionInfo): - """ - THIS MODEL WILL BE DEPRECATED. INSTEAD, USE ACTIVEPROJECT - WITH SUBMISSIONSTATUS=ARCHIVED. - - An archived project. Created when (maps to archive_reason): - 1. A user chooses to 'delete' their ActiveProject. - 2. An ActiveProject is not submitted for too long. - 3. An ActiveProject is submitted and rejected. - 4. An ActiveProject is submitted and times out. - """ - archive_datetime = models.DateTimeField(auto_now_add=True) - archive_reason = models.PositiveSmallIntegerField() - - # Subdirectory (under self.files.file_root) where files are stored - FILE_STORAGE_SUBDIR = 'archived-projects' - - class Meta: - default_permissions = ('change',) - - def __str__(self): - return ('{0} v{1}'.format(self.title, self.version)) diff --git a/physionet-django/project/models.py b/physionet-django/project/models.py index dc0ae2c02..e52f70ed5 100644 --- a/physionet-django/project/models.py +++ b/physionet-django/project/models.py @@ -1,6 +1,5 @@ from project.modelcomponents.access import * from project.modelcomponents.activeproject import * -from project.modelcomponents.archivedproject import * from project.modelcomponents.authors import * from project.modelcomponents.coreproject import * from project.modelcomponents.fields import *