1 files changed, 2 insertions, 78 deletions
diff --git a/archaeological_finds/models_treatments.py b/archaeological_finds/models_treatments.py
index 19f00de1f..4ee5fe08b 100644
--- a/archaeological_finds/models_treatments.py
+++ b/archaeological_finds/models_treatments.py
@@ -29,10 +29,10 @@ from django.utils.translation import ugettext_lazy as _
 from archaeological_finds.models_finds import Find, FindBasket, TreatmentType
 from archaeological_operations.models import ClosedItem, Operation
 from archaeological_warehouse.models import Warehouse, Container
-from ishtar_common.models import BaseSource, Document, GeneralType, \
+from ishtar_common.models import Document, GeneralType, \
     ImageModel, BaseHistorizedItem, OwnPerms, HistoricalRecords, Person, \
     Organization, ValueGetter, post_save_cache, ShortMenuItem, \
-    DashboardFormItem, IshtarImage, ThroughImage
+    DashboardFormItem
 from ishtar_common.utils import cached_label_changed, get_current_year
 
 
@@ -127,8 +127,6 @@ class Treatment(DashboardFormItem, ValueGetter, BaseHistorizedItem,
     documents = models.ManyToManyField(
         Document, related_name='treatments', verbose_name=_(u"Documents"),
         blank=True)
-    images = models.ManyToManyField(IshtarImage, verbose_name=_(u"Images"),
-                                    blank=True, through='TreatmentImage')
     cached_label = models.TextField(_(u"Cached name"), null=True, blank=True,
                                     db_index=True)
     history = HistoricalRecords()
@@ -309,11 +307,6 @@ def pre_delete_treatment(sender, **kwargs):
 pre_delete.connect(pre_delete_treatment, sender=Treatment)
 
 
-class TreatmentImage(ThroughImage):
-    item = models.ForeignKey(Treatment, on_delete=models.CASCADE,
-                             related_name='associated_images')
-
-
 class AbsFindTreatments(models.Model):
     find = models.ForeignKey(Find, verbose_name=_(u"Find"),
                              related_name='%(class)s_related')
@@ -614,72 +607,3 @@ class TreatmentFile(DashboardFormItem, ClosedItem, BaseHistorizedItem,
 
 
 post_save.connect(cached_label_changed, sender=TreatmentFile)
-
-
-class TreatmentSource(BaseSource):
-    treatment = models.ForeignKey(
-        Treatment, verbose_name=_(u"Treatment"), related_name="source")
-    BOOL_FIELDS = ['duplicate']
-    TABLE_COLS = ['treatment__cached_label'] + BaseSource.TABLE_COLS
-    COL_LABELS = {'treatment__cached_label': _(u"Treatment")}
-    SHOW_URL = 'show-treatmentsource'
-    PARENT_SEARCH_VECTORS = BaseSource.PARENT_SEARCH_VECTORS + ['treatment']
-
-    class Meta:
-        verbose_name = _(u"Treatment documentation")
-        verbose_name_plural = _(u"Treament documentations")
-        permissions = (
-            ("view_treatmentsource",
-             u"Can view all Treatment sources"),
-            ("view_own_treatmentsource",
-             u"Can view own Treatment source"),
-            ("add_own_treatmentsource",
-             u"Can add own Treatment source"),
-            ("change_own_treatmentsource",
-             u"Can change own Treatment source"),
-            ("delete_own_treatmentsource",
-             u"Can delete own Treatment source"),
-        )
-
-    @property
-    def owner(self):
-        return self.treatment
-
-    def _get_base_image_path(self):
-        return u"{}/source".format(self.treatment._get_base_image_path())
-
-
-class TreatmentFileSource(BaseSource):
-    treatment_file = models.ForeignKey(
-        TreatmentFile, verbose_name=_(u"Treatment request"),
-        related_name="source")
-    BOOL_FIELDS = ['duplicate']
-    TABLE_COLS = ['treatment_file__cached_label'] + BaseSource.TABLE_COLS
-    COL_LABELS = {'treatment_file__cached_label': _(u"Treatment file")}
-    SHOW_URL = 'show-treatmentfilesource'
-    PARENT_SEARCH_VECTORS = BaseSource.PARENT_SEARCH_VECTORS + [
-        'treatment_file']
-
-    class Meta:
-        verbose_name = _(u"Treatment request documentation")
-        verbose_name_plural = _(u"Treatment request documentations")
-        permissions = (
-            ("view_filetreatmentsource",
-             u"Can view Treatment request source"),
-            ("view_own_filetreatmentsource",
-             u"Can view own Treatment request source"),
-            ("add_own_filetreatmentsource",
-             u"Can add own Treatment request source"),
-            ("change_own_filetreatmentsource",
-             u"Can change own Treatment request source"),
-            ("delete_own_filetreatmentsource",
-             u"Can delete own Treatment request source"),
-        )
-
-    @property
-    def owner(self):
-        return self.treatment_file
-
-    def _get_base_image_path(self):
-        return u"treatmentfile/{}/{}/source".format(
-            self.treatment_file.year, self.treatment_file.index)