Do not show private dashboards, if user has no permission to save dashboards
This commit is contained in:
@ -43,9 +43,11 @@ module DashboardsHelper
|
|||||||
end
|
end
|
||||||
|
|
||||||
def render_dashboard_actionlist(active_dashboard, project = nil)
|
def render_dashboard_actionlist(active_dashboard, project = nil)
|
||||||
dashboards = sidebar_dashboards(active_dashboard, project)
|
dashboards = sidebar_dashboards active_dashboard, project
|
||||||
base_css = 'icon icon-dashboard'
|
base_css = 'icon icon-dashboard'
|
||||||
out = []
|
out = []
|
||||||
|
|
||||||
|
dashboards.select!(&:public?) unless User.current.allowed_to? :save_dashboards, project, global: true
|
||||||
dashboards.each do |dashboard|
|
dashboards.each do |dashboard|
|
||||||
css_class = base_css
|
css_class = base_css
|
||||||
dashboard_name = "#{l :label_dashboard}: #{dashboard.name}"
|
dashboard_name = "#{l :label_dashboard}: #{dashboard.name}"
|
||||||
@ -65,10 +67,10 @@ module DashboardsHelper
|
|||||||
end
|
end
|
||||||
|
|
||||||
def render_sidebar_dashboards(dashboard, project = nil)
|
def render_sidebar_dashboards(dashboard, project = nil)
|
||||||
dashboards = sidebar_dashboards(dashboard, project)
|
dashboards = sidebar_dashboards dashboard, project
|
||||||
out = [dashboard_links(l(:label_my_dashboard_plural),
|
out = [dashboard_links(l(:label_my_dashboard_plural),
|
||||||
dashboard,
|
dashboard,
|
||||||
dashboards.select(&:private?),
|
User.current.allowed_to?(:save_dashboards, project, global: true) ? dashboards.select(&:private?) : [],
|
||||||
project),
|
project),
|
||||||
dashboard_links(l(:label_shared_dashboard_plural),
|
dashboard_links(l(:label_shared_dashboard_plural),
|
||||||
dashboard,
|
dashboard,
|
||||||
|
@ -78,8 +78,7 @@ javascript:
|
|||||||
|
|
||||||
- if @dashboard_sidebar
|
- if @dashboard_sidebar
|
||||||
- content_for :sidebar do
|
- content_for :sidebar do
|
||||||
- if User.current.allowed_to? :save_dashboards, @project, global: true
|
= render_sidebar_dashboards @dashboard, @project
|
||||||
= render_sidebar_dashboards @dashboard, @project
|
|
||||||
= call_hook :view_projects_show_sidebar_bottom, project: @project
|
= call_hook :view_projects_show_sidebar_bottom, project: @project
|
||||||
|
|
||||||
- content_for :header_tags do
|
- content_for :header_tags do
|
||||||
|
Reference in New Issue
Block a user