Commit 063cafcc authored by Ryan Cobb's avatar Ryan Cobb

Fix name collision

parent f767c8a3
...@@ -23,9 +23,9 @@ module EnvironmentsHelper ...@@ -23,9 +23,9 @@ module EnvironmentsHelper
def metrics_data(project, environment) def metrics_data(project, environment)
metrics_data = {} metrics_data = {}
metrics_data.merge!(project_data(project)) if project metrics_data.merge!(project_metrics_data(project)) if project
metrics_data.merge!(environment_data(environment)) if environment metrics_data.merge!(environment_metrics_data(environment)) if environment
metrics_data.merge!(project_and_environment_data(project, environment)) if project && environment metrics_data.merge!(project_and_environment_metrics_data(project, environment)) if project && environment
metrics_data.merge!(static_data) metrics_data.merge!(static_data)
metrics_data metrics_data
...@@ -46,7 +46,7 @@ module EnvironmentsHelper ...@@ -46,7 +46,7 @@ module EnvironmentsHelper
private private
def project_data(project) def project_metrics_data(project)
return {} unless project return {} unless project
{ {
...@@ -64,7 +64,7 @@ module EnvironmentsHelper ...@@ -64,7 +64,7 @@ module EnvironmentsHelper
} }
end end
def environment_data(environment) def environment_metrics_data(environment)
return {} unless environment return {} unless environment
{ {
...@@ -75,7 +75,7 @@ module EnvironmentsHelper ...@@ -75,7 +75,7 @@ module EnvironmentsHelper
} }
end end
def project_and_environment_data(project, environment) def project_and_environment_metrics_data(project, environment)
return {} unless project && environment return {} unless project && environment
{ {
...@@ -87,7 +87,7 @@ module EnvironmentsHelper ...@@ -87,7 +87,7 @@ module EnvironmentsHelper
} }
end end
def static_data def static_metrics_data
{ {
'documentation-path' => help_page_path('administration/monitoring/prometheus/index.md'), 'documentation-path' => help_page_path('administration/monitoring/prometheus/index.md'),
'empty-getting-started-svg-path' => image_path('illustrations/monitoring/getting_started.svg'), 'empty-getting-started-svg-path' => image_path('illustrations/monitoring/getting_started.svg'),
......
...@@ -30,12 +30,12 @@ module EE ...@@ -30,12 +30,12 @@ module EE
super.merge(ee_environments_folder_list_view_data) super.merge(ee_environments_folder_list_view_data)
end end
override :project_data override :project_metrics_data
def project_data(project) def project_metrics_data(project)
ee_project_data = {} ee_project_metrics_data = {}
ee_project_data['logs_path'] = project_logs_path(project) if can?(current_user, :read_pod_logs, project) ee_project_metrics_data['logs_path'] = project_logs_path(project) if can?(current_user, :read_pod_logs, project)
super.merge(ee_project_data) super.merge(ee_project_metrics_data)
end end
end end
end end
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment