diff --git a/django_project_base/management/commands/confirm_setting.py b/django_project_base/management/commands/confirm_setting.py index a8f429de..39683da7 100644 --- a/django_project_base/management/commands/confirm_setting.py +++ b/django_project_base/management/commands/confirm_setting.py @@ -21,6 +21,7 @@ def handle(self, *args, **options): ) ProjectSettingConfirmedEvent(user=None).trigger(payload=setting) # TODO: send email when owner is known + # # TODO: SEND THIS AS SYSTEM MSG WHEN PR IS MERGED # SystemEMailNotification( # message=DjangoProjectBaseMessage( # subject=f"{__('Project setting confirmed')}", diff --git a/django_project_base/management/commands/list_pending_settings.py b/django_project_base/management/commands/list_pending_settings.py index eb67c7c0..0325d700 100644 --- a/django_project_base/management/commands/list_pending_settings.py +++ b/django_project_base/management/commands/list_pending_settings.py @@ -20,7 +20,7 @@ def handle(self, *args, **options): "pending_value": setting.python_pending_value, } # if to := getattr(settings, "ADMINS", getattr(settings, "MANAGERS", [])): - # TODO: SEND THIS AS SYSTEM MSG WHEN PR IS MERGED + # # TODO: SEND THIS AS SYSTEM MSG WHEN PR IS MERGED # EMailNotificationWithListOfEmails( # message=DjangoProjectBaseMessage( # subject=_("Pending settings report"), diff --git a/django_project_base/rest/project.py b/django_project_base/rest/project.py index 114ba5c9..f54055c0 100644 --- a/django_project_base/rest/project.py +++ b/django_project_base/rest/project.py @@ -203,11 +203,6 @@ def __init__(self, *args, is_filter: bool = False, **kwds): position=TablePosition.ROW_END, label="Confirm active", name="confirm-setting-active", - display_style=dict( - asButton=True, - showIcon=False, - showLabel=False, - ), ), ) diff --git a/vue/components/project-settings.vue b/vue/components/project-settings.vue index fea09491..6e3c52dd 100644 --- a/vue/components/project-settings.vue +++ b/vue/components/project-settings.vue @@ -204,9 +204,9 @@ const actionResetPending = async (action:Action, payload: FormPayload) => { const actionConfirmSettingActive = async (action:Action, payload: FormPayload) => { const activeData = {}; // @ts-ignore - active[PROFILE_TABLE_PRIMARY_KEY_PROPERTY_NAME] = payload[PROFILE_TABLE_PRIMARY_KEY_PROPERTY_NAME]; + activeData[PROFILE_TABLE_PRIMARY_KEY_PROPERTY_NAME] = payload[PROFILE_TABLE_PRIMARY_KEY_PROPERTY_NAME]; apiClient.post( - '/project-settings/reset-pending', + '/project-settings/confirm-setting-active', activeData, ).then(() => { refreshSettingsLogic();