Merge pull request #255 from wmo-raf/dev

Updates and Bug Fixes

nmhs_cms/__init__.py

@@ -2,7 +2,7 @@
 
 # major.minor.patch.release.number
 # release must be one of alpha, beta, rc, or final
-VERSION = (0, 9, 21, "final", 0)
+VERSION = (0, 9, 3, "final", 0)
 
 __version__ = get_version(VERSION)
 

nmhs_cms/settings/base.py

@@ -507,3 +507,5 @@
 
 DEFAULT_WAGTAILDOCS_EXTENSIONS = ['pdf', 'docx', 'xlsx', 'pptx', 'csv', 'odt', 'rtf', 'txt', 'key', 'zip', 'doc']
 WAGTAILDOCS_EXTENSIONS = env.list("WAGTAILDOCS_EXTENSIONS", default=DEFAULT_WAGTAILDOCS_EXTENSIONS)
+
+CAP_ALLOW_EDITING = env.bool("CAP_ALLOW_EDITING", default=False)

pages/cap/wagtail_hooks.py

@@ -31,12 +31,18 @@
     CapAlertListPage, get_currently_active_alerts, CAPAlertWebhook, CAPAlertWebhookEvent, OtherCAPSettings
 )
 from .utils import create_cap_geomanager_dataset
+from django.conf import settings
 
 
 class CAPPagePermissionHelper(PagePermissionHelper):
     def user_can_edit_obj(self, user, obj):
         can_edit = super().user_can_edit_obj(user, obj)
 
+        # allow editing if enabled from settings
+        can_edit_cap = getattr(settings, "CAP_ALLOW_EDITING", False)
+        if can_edit_cap:
+            return True
+
         if obj.live and obj.status == "Actual":
             return False
 
@@ -288,6 +294,10 @@ def copy_cap_alert_page(request, page):
 def before_edit_cap_alert_page(request, page):
     page = page.specific
     if page.__class__.__name__ == "CapAlertPage":
+        # allow editing if enabled from settings
+        can_edit_cap = getattr(settings, "CAP_ALLOW_EDITING", False)
+        if can_edit_cap:
+            return
         if page.live and page.status == "Actual":
             url = AdminURLHelper(page).get_action_url("index")
             messages.warning(request, gettext(

requirements.txt

@@ -9,7 +9,7 @@ attrs==23.1.0
 beautifulsoup4==4.9.3
 billiard==3.6.4.0
 cachetools==5.3.0
-capeditor==0.6.1
+capeditor==0.6.2
 Cartopy==0.22.0
 celery==5.2.7
 certifi==2023.07.22