diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-07-20 15:26:25 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-07-20 15:26:25 +0300 |
commit | a09983ae35713f5a2bbb100981116d31ce99826e (patch) | |
tree | 2ee2af7bd104d57086db360a7e6d8c9d5d43667a /app/helpers/projects | |
parent | 18c5ab32b738c0b6ecb4d0df3994000482f34bd8 (diff) |
Add latest changes from gitlab-org/gitlab@13-2-stable-ee
Diffstat (limited to 'app/helpers/projects')
-rw-r--r-- | app/helpers/projects/alert_management_helper.rb | 16 |
1 files changed, 13 insertions, 3 deletions
diff --git a/app/helpers/projects/alert_management_helper.rb b/app/helpers/projects/alert_management_helper.rb index bc585899591..d6e8e738a1c 100644 --- a/app/helpers/projects/alert_management_helper.rb +++ b/app/helpers/projects/alert_management_helper.rb @@ -4,10 +4,11 @@ module Projects::AlertManagementHelper def alert_management_data(current_user, project) { 'project-path' => project.full_path, - 'enable-alert-management-path' => edit_project_service_path(project, AlertsService), + 'enable-alert-management-path' => project_settings_operations_path(project, anchor: 'js-alert-management-settings'), + 'populating-alerts-help-url' => help_page_url('user/project/operations/alert_management.html', anchor: 'enable-alert-management'), 'empty-alert-svg-path' => image_path('illustrations/alert-management-empty-state.svg'), - 'user-can-enable-alert-management' => can?(current_user, :admin_project, project).to_s, - 'alert-management-enabled' => (!!project.alerts_service_activated?).to_s + 'user-can-enable-alert-management' => can?(current_user, :admin_operations, project).to_s, + 'alert-management-enabled' => alert_management_enabled?(project).to_s } end @@ -15,7 +16,16 @@ module Projects::AlertManagementHelper { 'alert-id' => alert_id, 'project-path' => project.full_path, + 'project-id' => project.id, 'project-issues-path' => project_issues_path(project) } end + + private + + def alert_management_enabled?(project) + !!(project.alerts_service_activated? || project.prometheus_service_active?) + end end + +Projects::AlertManagementHelper.prepend_if_ee('EE::Projects::AlertManagementHelper') |