From 3a69a9e48d29d11af3c321ce51690189ece8bea6 Mon Sep 17 00:00:00 2001 From: mkangia Date: Wed, 13 Dec 2023 17:29:25 +0530 Subject: [PATCH 1/5] adds new permission --- ...056_add_manage_domain_alerts_permission.py | 22 +++++++++++++++++++ corehq/apps/users/models.py | 2 ++ migrations.lock | 1 + 3 files changed, 25 insertions(+) create mode 100644 corehq/apps/users/migrations/0056_add_manage_domain_alerts_permission.py diff --git a/corehq/apps/users/migrations/0056_add_manage_domain_alerts_permission.py b/corehq/apps/users/migrations/0056_add_manage_domain_alerts_permission.py new file mode 100644 index 000000000000..c1462fe867c5 --- /dev/null +++ b/corehq/apps/users/migrations/0056_add_manage_domain_alerts_permission.py @@ -0,0 +1,22 @@ +# Generated by Django 3.2.23 on 2023-12-13 10:09 + +from django.db import migrations + +from corehq.apps.users.models_role import Permission +from corehq.util.django_migrations import skip_on_fresh_install + + +@skip_on_fresh_install +def create_manage_domain_alerts_permission(*args, **kwargs): + Permission.objects.get_or_create(value='manage_domain_alerts') + + +class Migration(migrations.Migration): + + dependencies = [ + ('users', '0055_add_user_data'), + ] + + operations = [ + migrations.RunPython(create_manage_domain_alerts_permission, migrations.RunPython.noop) + ] diff --git a/corehq/apps/users/models.py b/corehq/apps/users/models.py index c01fd09428c2..c9fb94690cb0 100644 --- a/corehq/apps/users/models.py +++ b/corehq/apps/users/models.py @@ -225,6 +225,8 @@ class HqPermissions(DocumentSchema): view_data_registry_contents_list = StringListProperty(default=[]) manage_attendance_tracking = BooleanProperty(default=False) + manage_domain_alerts = BooleanProperty(default=False) + @classmethod def from_permission_list(cls, permission_list): """Converts a list of Permission objects into a Permissions object""" diff --git a/migrations.lock b/migrations.lock index 493b6e4486e3..8187c2a4ff58 100644 --- a/migrations.lock +++ b/migrations.lock @@ -1181,6 +1181,7 @@ users 0053_userreportingmetadatastaging_fcm_token 0054_connectiduserlink 0055_add_user_data + 0056_add_manage_domain_alerts_permission util 0001_initial 0002_complaintbouncemeta_permanentbouncemeta_transientbounceemail From 66ee27e347b18a6fb31157951dea573cf0d90272 Mon Sep 17 00:00:00 2001 From: mkangia Date: Wed, 13 Dec 2023 17:30:00 +0530 Subject: [PATCH 2/5] updates role UI with new permission --- .../users/partials/edit_role_modal.html | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/corehq/apps/users/templates/users/partials/edit_role_modal.html b/corehq/apps/users/templates/users/partials/edit_role_modal.html index 0bc1184adf18..215099ac6d64 100644 --- a/corehq/apps/users/templates/users/partials/edit_role_modal.html +++ b/corehq/apps/users/templates/users/partials/edit_role_modal.html @@ -466,6 +466,23 @@

+ {% if request|toggle_enabled:"CUSTOM_DOMAIN_BANNER_ALERTS" %} +
+ +
+
+ + +
+
+
+ {% endif %}
From a8fb8bc4b4c6a116c5689c77fab2c153f60c7929 Mon Sep 17 00:00:00 2001 From: mkangia Date: Wed, 13 Dec 2023 17:32:14 +0530 Subject: [PATCH 3/5] adds navigation --- corehq/tabs/tabclasses.py | 28 ++++++++++++++++++++-------- 1 file changed, 20 insertions(+), 8 deletions(-) diff --git a/corehq/tabs/tabclasses.py b/corehq/tabs/tabclasses.py index fa41f7b9683e..3fef8005c73e 100644 --- a/corehq/tabs/tabclasses.py +++ b/corehq/tabs/tabclasses.py @@ -1881,6 +1881,7 @@ def sidebar_items(self): items = [] user_is_admin = self.couch_user.is_domain_admin(self.domain) user_is_billing_admin = self.couch_user.can_edit_billing() + user_can_manage_domain_alerts = self.couch_user.can_manage_domain_alerts(self.domain) has_project_access = has_privilege(self._request, privileges.PROJECT_ACCESS) project_info = [] @@ -1910,8 +1911,14 @@ def sidebar_items(self): items.append((_('Project Information'), project_info)) - if user_is_admin and has_project_access: - items.append((_('Project Administration'), _get_administration_section(self.domain))) + if (user_is_admin or user_can_manage_domain_alerts) and has_project_access: + section = [] + if user_is_admin: + section = _get_administration_section(self.domain) + elif user_can_manage_domain_alerts: + section = _get_manage_domain_alerts_section(self.domain) + if section: + items.append((_('Project Administration'), section)) if self.couch_user.can_edit_motech() and has_project_access: integration_nav = _get_integration_section(self.domain, self.couch_user) @@ -2019,7 +2026,6 @@ def _get_administration_section(domain): from corehq.apps.domain.views.settings import ( FeaturePreviewsView, ManageDomainMobileWorkersView, - ManageDomainAlertsView, RecoveryMeasuresHistory, ) from corehq.apps.ota.models import MobileRecoveryMeasure @@ -2037,11 +2043,7 @@ def _get_administration_section(domain): 'url': reverse(FeaturePreviewsView.urlname, args=[domain]) }) - if toggles.CUSTOM_DOMAIN_BANNER_ALERTS.enabled(domain): - administration.append({ - 'title': _(ManageDomainAlertsView.page_title), - 'url': reverse(ManageDomainAlertsView.urlname, args=[domain]) - }) + administration.extend(_get_manage_domain_alerts_section(domain)) if toggles.TRANSFER_DOMAIN.enabled(domain): administration.append({ @@ -2065,6 +2067,16 @@ def _get_administration_section(domain): return administration +def _get_manage_domain_alerts_section(domain): + from corehq.apps.domain.views.settings import ManageDomainAlertsView + + if toggles.CUSTOM_DOMAIN_BANNER_ALERTS.enabled(domain): + return [{ + 'title': _(ManageDomainAlertsView.page_title), + 'url': reverse(ManageDomainAlertsView.urlname, args=[domain]) + }] + + def _get_integration_section(domain, couch_user): def _get_forward_name(repeater_type=None, **context): From 7dd70380582360098f1aba7d59ca71c2b3fac1ff Mon Sep 17 00:00:00 2001 From: mkangia Date: Wed, 13 Dec 2023 17:35:44 +0530 Subject: [PATCH 4/5] updates access to views - change view inheritance to BaseProjectSettingsView - add a new permission decorator for views --- corehq/apps/domain/views/settings.py | 10 ++++++---- corehq/apps/users/decorators.py | 1 + 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/corehq/apps/domain/views/settings.py b/corehq/apps/domain/views/settings.py index 10f2d97e4df4..b09ff7a65415 100644 --- a/corehq/apps/domain/views/settings.py +++ b/corehq/apps/domain/views/settings.py @@ -56,6 +56,7 @@ from corehq.apps.hqwebapp.signals import clear_login_attempts from corehq.apps.locations.permissions import location_safe from corehq.apps.ota.models import MobileRecoveryMeasure +from corehq.apps.users.decorators import require_can_manage_domain_alerts from corehq.apps.users.models import CouchUser from corehq.toggles import NAMESPACE_DOMAIN from corehq.toggles.models import Toggle @@ -526,8 +527,9 @@ class ManageDomainMobileWorkersView(ManageMobileWorkersMixin, BaseAdminProjectSe urlname = 'domain_manage_mobile_workers' -@method_decorator(toggles.CUSTOM_DOMAIN_BANNER_ALERTS.required_decorator(), name='dispatch') -class ManageDomainAlertsView(BaseAdminProjectSettingsView): +@method_decorator([toggles.CUSTOM_DOMAIN_BANNER_ALERTS.required_decorator(), + require_can_manage_domain_alerts], name='dispatch') +class ManageDomainAlertsView(BaseProjectSettingsView): template_name = 'domain/admin/manage_alerts.html' urlname = 'domain_manage_alerts' page_title = gettext_lazy("Manage Project Alerts") @@ -572,7 +574,7 @@ def _create_alert(self): @toggles.CUSTOM_DOMAIN_BANNER_ALERTS.required_decorator() -@domain_admin_required +@require_can_manage_domain_alerts @require_POST def update_domain_alert_status(request, domain): alert_id = request.POST.get('alert_id') @@ -587,7 +589,7 @@ def update_domain_alert_status(request, domain): @toggles.CUSTOM_DOMAIN_BANNER_ALERTS.required_decorator() -@domain_admin_required +@require_can_manage_domain_alerts @require_POST def delete_domain_alert(request, domain): alert_id = request.POST.get('alert_id') diff --git a/corehq/apps/users/decorators.py b/corehq/apps/users/decorators.py index 8b2c3bdb406e..16ef7819972b 100644 --- a/corehq/apps/users/decorators.py +++ b/corehq/apps/users/decorators.py @@ -149,6 +149,7 @@ def _check_permission(_user, _domain): require_can_view_roles = require_permission('view_roles') require_can_login_as = require_permission_raw(lambda user, domain: user.can_login_as(domain)) require_can_coordinate_events = require_permission('manage_attendance_tracking') +require_can_manage_domain_alerts = require_permission('manage_domain_alerts') def require_permission_to_edit_user(view_func): From ab268b6fc5b6273b5b224bbc75636e865548ae2e Mon Sep 17 00:00:00 2001 From: mkangia Date: Wed, 13 Dec 2023 18:15:46 +0530 Subject: [PATCH 5/5] enforces return from function --- corehq/tabs/tabclasses.py | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/corehq/tabs/tabclasses.py b/corehq/tabs/tabclasses.py index 3fef8005c73e..a9b6db7f98e4 100644 --- a/corehq/tabs/tabclasses.py +++ b/corehq/tabs/tabclasses.py @@ -2069,12 +2069,14 @@ def _get_administration_section(domain): def _get_manage_domain_alerts_section(domain): from corehq.apps.domain.views.settings import ManageDomainAlertsView + section = [] if toggles.CUSTOM_DOMAIN_BANNER_ALERTS.enabled(domain): - return [{ + section.append({ 'title': _(ManageDomainAlertsView.page_title), 'url': reverse(ManageDomainAlertsView.urlname, args=[domain]) - }] + }) + return section def _get_integration_section(domain, couch_user):