From 4c1951e79e64c20202bf02a746c25477411e51e9 Mon Sep 17 00:00:00 2001 From: Alexander Meindl Date: Sat, 1 Aug 2020 19:04:59 +0200 Subject: [PATCH] Do not show expose_always, if set_system_default is not viewable --- app/controllers/dashboards_controller.rb | 1 + app/views/dashboards/_form.html.slim | 13 ++++++++++++- 2 files changed, 13 insertions(+), 1 deletion(-) diff --git a/app/controllers/dashboards_controller.rb b/app/controllers/dashboards_controller.rb index f9171379..cc45d41f 100644 --- a/app/controllers/dashboards_controller.rb +++ b/app/controllers/dashboards_controller.rb @@ -49,6 +49,7 @@ class DashboardsController < ApplicationController def show respond_to do |format| + format.html { head 406 } format.js if request.xhr? format.api end diff --git a/app/views/dashboards/_form.html.slim b/app/views/dashboards/_form.html.slim index 64ccddbe..5fd13fc8 100644 --- a/app/views/dashboards/_form.html.slim +++ b/app/views/dashboards/_form.html.slim @@ -52,7 +52,7 @@ - if User.current.allowed_to? :set_system_dashboards, @project, global: true p = f.check_box :system_default - p = f.check_box :always_expose + p#always-expose = f.check_box :always_expose - elsif @dashboard.system_default? p = f.check_box :system_default, disabled: true p = f.check_box :always_expose @@ -72,4 +72,15 @@ javascript: var private_checked = $('#dashboard_visibility_0').is(':checked'); $("input[name='dashboard[role_ids][]'][type=checkbox]").attr('disabled', !roles_checked); }).trigger('change'); + + $("input[name='dashboard[system_default]']").change(function(){ + var selection = $('#dashboard_system_default').is(':checked'); + console.log(selection) + if (selection) { + $('#always-expose').show(); + } + else { + $('#always-expose').hide(); + } + }).trigger('change'); });