diff --git a/atlas/api.py b/atlas/api.py index 9e99e14c..e9ed77bc 100644 --- a/atlas/api.py +++ b/atlas/api.py @@ -239,7 +239,7 @@ def check_images_hashes(request, hashes: List[str]): for hash in hashes: try: - print(hash) + # TOOD also check against uncategorised dicoms? series_image = SeriesImage.objects.get(image_blake3_hash=hash) data = { "id": series_image.pk, diff --git a/generic/models.py b/generic/models.py index c95933c2..5ad15a11 100644 --- a/generic/models.py +++ b/generic/models.py @@ -258,11 +258,11 @@ class SeriesImageBase(models.Model): def save(self, *args, **kwargs): """Override save method to add image hash""" if self.image: - if not self.image_md5_hash: - image_hash, is_dicom = get_image_hash(self.image, hash_type="md5", direct_pixel_data=False) + #if not self.image_md5_hash: + # image_hash, is_dicom = get_image_hash(self.image, hash_type="md5", direct_pixel_data=False) - self.is_dicom = is_dicom - self.image_md5_hash = image_hash + # self.is_dicom = is_dicom + # self.image_md5_hash = image_hash if not self.image_blake3_hash: image_blake3_hash, is_dicom = get_image_hash(self.image, hash_type="blake3", direct_pixel_data=True) diff --git a/generic/templates/generic/cid_group_view_detail.html b/generic/templates/generic/cid_group_view_detail.html index 727d27f8..5ba72409 100755 --- a/generic/templates/generic/cid_group_view_detail.html +++ b/generic/templates/generic/cid_group_view_detail.html @@ -18,14 +18,14 @@ {% if group_type == "cid" %} - EmailCIDPasscode + NameEmailCIDPasscode {% else %} User {% endif %} {% for user in users %} {% if group_type == "cid" %} - {{user.email}}{{user.cid}}{{user.passcode}} + {{user.name}}{{user.email}}{{user.cid}}{{user.passcode}} {% else %} {{user.username}} {% endif %}