From 5254d62b9e682048abd9e75485a3eb60a9e9091c Mon Sep 17 00:00:00 2001 From: Alex Tannenbaum Date: Wed, 31 Jul 2024 13:41:24 -0400 Subject: [PATCH 1/2] get rid of "(PM)" --- events/forms.py | 2 +- site_tmpl/uglydetail.html | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/events/forms.py b/events/forms.py index 7c60f071..e6916355 100644 --- a/events/forms.py +++ b/events/forms.py @@ -733,7 +733,7 @@ class Meta: group_label=lambda group: group.name, ) contact = AutoCompleteSelectField('Users', required=False) - lnl_contact = AutoCompleteSelectField('Members', label="LNL Contact (PM)", required=False) + lnl_contact = AutoCompleteSelectField('Members', label="LNL Contact", required=False) org = CustomAutoCompleteSelectMultipleField('Orgs', required=False, label="Client(s)") billing_org = AutoCompleteSelectField('Orgs', required=False, label="Client to bill") datetime_setup_complete = forms.SplitDateTimeField(initial=timezone.now, label="Setup Completed") diff --git a/site_tmpl/uglydetail.html b/site_tmpl/uglydetail.html index a8f603e2..137c19d8 100644 --- a/site_tmpl/uglydetail.html +++ b/site_tmpl/uglydetail.html @@ -201,7 +201,7 @@

Confirm Reopen Event

{{event.event_status}} - LNL Contact (PM) + LNL Contact {% if event.lnl_contact %} {{ event.lnl_contact.get_full_name }} From 434e593c3cabbd750c36f5ccf9195daa2e418dee Mon Sep 17 00:00:00 2001 From: Alex Tannenbaum Date: Wed, 31 Jul 2024 20:41:26 -0400 Subject: [PATCH 2/2] Fix lnl_contact and event_status permissions not working --- events/forms.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/events/forms.py b/events/forms.py index e6916355..feab3eca 100644 --- a/events/forms.py +++ b/events/forms.py @@ -536,12 +536,12 @@ def __init__(self): change_lnl_contact = FieldAccessLevel( lambda user, instance: user.has_perm('events.edit_event_lnl_contact', instance), - enable=('lnl_contact') + enable=('lnl_contact',) ) change_event_status = FieldAccessLevel( lambda user, instance: user.has_perm('events.edit_event_status', instance), - enable=('event_status') + enable=('event_status',) ) class Meta: @@ -686,12 +686,12 @@ def __init__(self): change_lnl_contact = FieldAccessLevel( lambda user, instance: user.has_perm('events.edit_event_lnl_contact', instance), - enable=('lnl_contact') + enable=('lnl_contact',) ) change_event_status = FieldAccessLevel( lambda user, instance: user.has_perm('events.edit_event_status', instance), - enable=('event_status') + enable=('event_status',) ) change_entered_into_workday = FieldAccessLevel(