[Dj4.2] [ch32786] update attachments permissions

pyproject.toml

@@ -9,72 +9,71 @@ authors = [
 ]
 
 dependencies = [
-    "azure-common",
-    "azure-storage-blob",
-    "azure-storage-common",
-    "carto",
-    "celery",
-    "cryptography",
-    "dj-database-url",
-    "dj-static",
-    "Django==4.2.3",
-    "django-admin-extra-urls",
-    "django-appconf",
-    "django-celery-beat",
-    "django-celery-email",
-    "django-celery-results",
-    "django-contrib-comments",
-    "django-cors-headers",
-    "django-debug-toolbar",
-    "django-extensions",
-    "django-easy-pdf3",
-    "django-filter",
-    "django-fsm",
-    "django-import-export",
-    "django-js-asset",
-    "django-leaflet",
-    "django-logentry-admin",
-    "django-model-utils",
-    "django-ordered-model",
-    "django-post-office",
-    "django-redis-cache",
-    "django-rest-swagger",
+    'azure-common==1.1.28',
+    'azure-storage-blob==12.20.0',
+    'azure-storage-common==2.1.0',
+    'carto==1.11.3',
+    'celery==5.4.0',
+    'cryptography==42.0.7',
+    'dj-database-url==2.1.0',
+    'dj-static==0.0.6',
+    'Django==4.2.3',
+    'django-admin-extra-urls==4.1.1',
+    'django-appconf==1.0.6',
+    'django-celery-beat==2.6.0',
+    'django-celery-email==3.0.0',
+    'django-celery-results==2.5.1',
+    'django-contrib-comments==2.2.0',
+    'django-cors-headers==4.3.1',
+    'django-debug-toolbar==4.3.0',
+    'django-easy-pdf3==0.1.4',
+    'django-extensions==3.2.3',
+    'django-filter==24.2',
+    'django-fsm==3.0.0',
+    'django-import-export==4.0.2',
+    'django-js-asset==2.2.0',
+    'django-leaflet==0.30.0',
+    'django-logentry-admin==1.1.0',
+    'django-model-utils==4.5.1',
+    'django-ordered-model==3.7.4',
+    'django-post-office==3.8.0',
+    'django-redis-cache==3.0.1',
+    'django-rest-swagger==2.2.0',
     "django-storages[azure]==1.13.2",
-    "django-tenants",
-    "django-timezone-field",
-    "django-waffle",
-    "djangorestframework-csv",
-    "djangorestframework-gis",
-    "djangorestframework-simplejwt",
-    "djangorestframework-recursive",
-    "djangorestframework-xml",
-    "djangorestframework",
-    "drf-nested-routers",
-    "drf-querystringfilter",
-    "etools-validator",
-    "etools-offline",
-    "flower",
-    "gunicorn",
-    "newrelic",
-    "openpyxl",
-    "pyyaml",
-    "Pillow",
-    "psycopg2-binary",
-    "reportlab",
-    "sentry-sdk",
-    "requests",
-    "social-auth-app-django",
+    'django-tenants==3.6.1',
+    'django-timezone-field==6.1.0',
+    'django-waffle==4.1.0',
+    'djangorestframework==3.15.1',
+    'djangorestframework-csv==3.0.2',
+    'djangorestframework-gis==1.0',
+    'djangorestframework-recursive==0.1.2',
+    'djangorestframework-simplejwt==5.3.1',
+    'djangorestframework-xml==2.0.0',
+    'drf-nested-routers==0.94.1',
+    'drf-querystringfilter==1.0.0',
+    'etools-offline==0.1.0',
+    'etools-validator==0.5.1',
+    'flower==2.0.1',
+    'gunicorn==22.0.0',
+    'msal==1.28.0',
+    'newrelic==9.9.1',
+    'openpyxl==3.1.2',
+    'psycopg2-binary==2.9.9',
+    'pyyaml==6.0.1',
+    'reportlab==4.0.9',
+    'requests==2.31.0',
+    'sentry-sdk==2.1.1',
+    'social-auth-app-django==5.4.1',
     "social-auth-core[azuread]==4.5.4",
-    "tenant-schemas-celery",
-    "unicef-attachments",
-    "unicef-djangolib",
-    "unicef-locations",
-    "unicef-notification",
-    "unicef-restlib",
-    "unicef-snapshot",
-    "unicef-rest-export",
-    "unicef-vision",
-    "msal",
+    'tenant-schemas-celery==2.2.0',
+    'unicef-attachments @ git+https://github.com/unicef/unicef-attachments.git@b720a3ef26e3320a559f72ed1918c798dd2d7b67',
+    'unicef-djangolib==0.7',
+    'unicef-locations==4.2',
+    'unicef-notification==1.4',
+    'unicef-rest-export==0.6',
+    'unicef-restlib==0.7',
+    'unicef-snapshot==1.3',
+    'unicef-vision==0.6',
     "gdal==3.8.5",
     "jsonschema>=4.22.0",
     "setuptools>=70.1.1",

src/etools/__init__.py

@@ -1,2 +1,2 @@
-VERSION = __version__ = '11.5.3'
+VERSION = __version__ = '11.7'
 NAME = 'eTools'

src/etools/applications/action_points/admin.py

@@ -2,14 +2,13 @@
 from django.contrib.contenttypes.admin import GenericStackedInline
 from django.urls import reverse
 
-from django_comments.models import Comment
 from unicef_snapshot.admin import ActivityInline, SnapshotModelAdmin
 
-from etools.applications.action_points.models import ActionPoint
+from etools.applications.action_points.models import ActionPoint, ActionPointComment
 
 
 class CommentInline(GenericStackedInline):
-    model = Comment
+    model = ActionPointComment
     ct_field = "content_type"
     ct_fk_field = "object_pk"
     fields = ["user", "comment", "submit_date"]
@@ -20,7 +19,7 @@ class CommentInline(GenericStackedInline):
 
     def view_on_site(self, obj):
         return reverse('admin:%s_%s_change' %
-                       (self.opts.app_label, self.opts.model_name),
+                       ('django_comments', 'comment'),
                        args=(obj.pk,),
                        current_app=self.admin_site.name)
 
@@ -36,7 +35,7 @@ class ActionPointAdmin(SnapshotModelAdmin):
     inlines = (CommentInline, ActivityInline, )
     raw_id_fields = ('section', 'office', 'location', 'cp_output', 'partner', 'intervention', 'tpm_activity',
                      'psea_assessment', 'travel_activity', 'engagement', 'author', 'assigned_by', 'assigned_to',
-                     'monitoring_activity')
+                     'monitoring_activity', 'verified_by', 'potential_verifier')
 
 
 admin.site.register(ActionPoint, ActionPointAdmin)

src/etools/applications/action_points/export/export_non_ascii_patch.py

@@ -0,0 +1,54 @@
+import types
+
+from openpyxl.styles import Alignment, Font
+from openpyxl.utils import get_column_letter
+from openpyxl.utils.exceptions import IllegalCharacterError
+from tablib.formats._xlsx import XLSXFormat
+
+
+def dset_sheet(cls, dataset, ws, freeze_panes=True, escape=False):
+    """Completes given worksheet from given Dataset."""
+    _package = dataset._package(dicts=False)
+
+    for i, sep in enumerate(dataset._separators):
+        _offset = i
+        _package.insert((sep[0] + _offset), (sep[1],))
+
+    bold = Font(bold=True)
+    wrap_text = Alignment(wrap_text=True)
+
+    for i, row in enumerate(_package):
+        row_number = i + 1
+        for j, col in enumerate(row):
+            col_idx = get_column_letter(j + 1)
+            cell = ws[f'{col_idx}{row_number}']
+
+            # bold headers
+            if (row_number == 1) and dataset.headers:
+                cell.font = bold
+                if freeze_panes:
+                    #  Export Freeze only after first Line
+                    ws.freeze_panes = 'A2'
+
+            # bold separators
+            elif len(row) < dataset.width:
+                cell.font = bold
+
+            # wrap the rest
+            else:
+                if '\n' in str(col):
+                    cell.alignment = wrap_text
+
+            try:
+                cell.value = col
+            except ValueError:
+                cell.value = str(col)
+            except IllegalCharacterError:
+                from openpyxl.cell.cell import ILLEGAL_CHARACTERS_RE
+                cell.value = ILLEGAL_CHARACTERS_RE.sub(r'', col)
+
+            if escape and cell.data_type == 'f' and cell.value.startswith('='):
+                cell.value = cell.value.replace("=", "")
+
+
+XLSXFormat.dset_sheet = types.MethodType(dset_sheet, XLSXFormat)

src/etools/applications/action_points/migrations/0003_actionpointcomment.py

@@ -0,0 +1,27 @@
+# Generated by Django 4.2.3 on 2024-08-01 07:38
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('django_comments', '0004_add_object_pk_is_removed_index'),
+        ('action_points', '0002_initial'),
+    ]
+
+    operations = [
+        migrations.CreateModel(
+            name='ActionPointComment',
+            fields=[
+            ],
+            options={
+                'verbose_name': 'Action Point Comment',
+                'verbose_name_plural': 'Action Point Comments',
+                'proxy': True,
+                'indexes': [],
+                'constraints': [],
+            },
+            bases=('django_comments.comment',),
+        ),
+    ]

src/etools/applications/action_points/models.py

@@ -4,10 +4,13 @@
 from django.db import connection, models
 from django.utils.translation import gettext_lazy as _
 
+from django_comments.models import Comment
 from django_fsm import FSMField, transition
 from model_utils import Choices, FieldTracker
 from model_utils.fields import MonitorField
 from model_utils.models import TimeStampedModel
+from unicef_attachments.models import Attachment
+from unicef_djangolib.fields import CodedGenericRelation
 from unicef_snapshot.models import Activity
 
 from etools.applications.action_points.categories.models import Category
@@ -20,6 +23,17 @@
 from etools.libraries.fsm.views import has_action_permission
 
 
+class ActionPointComment(Comment):
+    supporting_document = CodedGenericRelation(
+        Attachment, verbose_name=_('Related Documents'), code='action_points_supporting_document', blank=True
+    )
+
+    class Meta:
+        proxy = True
+        verbose_name = _('Action Point Comment')
+        verbose_name_plural = _('Action Point Comments')
+
+
 class ActionPointManager(models.Manager):
     def get_queryset(self):
         return super().get_queryset().prefetch_related('author',
@@ -87,7 +101,7 @@ class ActionPoint(TimeStampedModel):
                                       default=None, monitor='status', when=[STATUSES.completed])
     date_of_verification = MonitorField(verbose_name=_('Date Action Point Verified'), null=True, blank=True,
                                         default=None, monitor='verified_by')
-    comments = GenericRelation('django_comments.Comment', object_id_field='object_pk')
+    comments = GenericRelation(ActionPointComment, object_id_field='object_pk')
     history = GenericRelation('unicef_snapshot.Activity', object_id_field='target_object_id',
                               content_type_field='target_content_type')
     reference_number = models.CharField(