Add dashboard lock/unlock actions in menu and fix assert_nil for Redmine master compatibility

alexandermeindl · alexandermeindl · commit 958a0c2cfbd9 · 2026-01-26T11:57:37.000+01:00
diff --git a/app/controllers/dashboards_controller.rb b/app/controllers/dashboards_controller.rb
@@ -155,6 +155,22 @@ def destroy
     end
   end
 
+  def lock
+    return render_403 unless @dashboard.editable?
+
+    @dashboard.update! locked: true
+    flash[:notice] = l :notice_successful_update
+    redirect_to dashboard_link_path(@project, @dashboard)
+  end
+
+  def unlock
+    return render_403 unless @dashboard.editable?
+
+    @dashboard.update! locked: false
+    flash[:notice] = l :notice_successful_update
+    redirect_to dashboard_link_path(@project, @dashboard)
+  end
+
   def update_layout_setting
     block_settings = params[:settings] || {}
 
diff --git a/app/views/projects/show.html.slim b/app/views/projects/show.html.slim
@@ -55,6 +55,18 @@
         = link_to sprite_icon('copy', entity_headline(object_name: :label_dashboard, type: :copy)),
                   new_project_dashboard_path(@project, copy: @dashboard.id),
                   class: 'icon icon-copy'
+        - if @dashboard.locked?
+          = link_to svg_icon_tag('unlock', label: :label_dashboard_unlock, plugin: ''),
+                    unlock_project_dashboard_path(@project, @dashboard),
+                    data: { confirm: l(:text_dashboard_unlock_confirmation) },
+                    method: :put,
+                    class: 'icon icon-unlock'
+        - else
+          = link_to svg_icon_tag('lock', label: :label_dashboard_lock, plugin: ''),
+                    lock_project_dashboard_path(@project, @dashboard),
+                    data: { confirm: l(:text_dashboard_lock_confirmation) },
+                    method: :put,
+                    class: 'icon icon-lock'
 
     - if @dashboard&.deletable?
       = delete_dashboard_link project_dashboard_path(@project, @dashboard), @dashboard
diff --git a/app/views/welcome/index.html.slim b/app/views/welcome/index.html.slim
@@ -25,6 +25,18 @@
         = link_to sprite_icon('copy', entity_headline(object_name: :label_dashboard, type: :copy)),
                   new_dashboard_path(copy: @dashboard.id),
                   class: 'icon icon-copy'
+        - if @dashboard.locked?
+          = link_to svg_icon_tag('unlock', label: :label_dashboard_unlock, plugin: ''),
+                    unlock_dashboard_path(@dashboard),
+                    data: { confirm: l(:text_dashboard_unlock_confirmation) },
+                    method: :put,
+                    class: 'icon icon-unlock'
+        - else
+          = link_to svg_icon_tag('lock', label: :label_dashboard_lock, plugin: ''),
+                    lock_dashboard_path(@dashboard),
+                    data: { confirm: l(:text_dashboard_lock_confirmation) },
+                    method: :put,
+                    class: 'icon icon-lock'
     - if @dashboard&.deletable?
       = delete_dashboard_link dashboard_path(@dashboard), @dashboard
     = sidebar_action_toggle @dashboard_sidebar, @dashboard
diff --git a/config/locales/cs.yml b/config/locales/cs.yml
@@ -90,8 +90,10 @@ cs:
   label_dashboard_block_info_async: "Tento blok se načítá asynchronně a ukládá se do mezipaměti po dobu %{time}."
   label_dashboard_legacy_left: "Zbývá standardní obsah"
   label_dashboard_legacy_right: "Standardní obsahové právo"
+  label_dashboard_lock: Aktivovat zámek dashboardu
   label_dashboard_lock_is_active: "Dashboard Zámek je aktivní"
   label_dashboard_plural: Dashboards
+  label_dashboard_unlock: Odstranit zámek dashboardu
   label_day: den
   label_default_sort_by: "Výchozí třídění podle"
   label_disable_sidebar: "Zakázat sidebar"
@@ -222,3 +224,5 @@ cs:
   field_watched_by_me: "Sledováno mnou"
   label_with_amount: "Částka %{value}"
   label_list_all_entries: "Seznam všech %{value}"
+  text_dashboard_lock_confirmation: Opravdu chcete zamknout tento dashboard?
+  text_dashboard_unlock_confirmation: Opravdu chcete odemknout tento dashboard?
diff --git a/config/locales/de.yml b/config/locales/de.yml
@@ -90,8 +90,10 @@ de:
   label_dashboard_block_info_async: Dieser Block wird asynchron geladen und %{time} gecached.
   label_dashboard_legacy_left: Standard-Inhalt links
   label_dashboard_legacy_right: Standard-Inhalt rechts
+  label_dashboard_lock: Dashboard Schutz aktivieren
   label_dashboard_lock_is_active: Dashboard Schutz ist aktiv
   label_dashboard_plural: Dashboards
+  label_dashboard_unlock: Dashboard Schutz entfernen
   label_day: Tag
   label_default_sort_by: Standard-Sortierreihenfolge
   label_disable_sidebar: Sidebar deaktivieren
@@ -222,3 +224,5 @@ de:
   field_watched_by_me: Von mir beobachtet
   label_with_amount: "Anzahl %{value}"
   label_list_all_entries: "Alle %{value} auflisten"
+  text_dashboard_lock_confirmation: Möchtest du dieses Dashboard wirklich sperren?
+  text_dashboard_unlock_confirmation: Möchtest du die Sperre für dieses Dashboard wirklich aufheben?
diff --git a/config/locales/en.yml b/config/locales/en.yml
@@ -90,8 +90,10 @@ en:
   label_dashboard_block_info_async: This block is loaded asynchronous and cached for %{time}.
   label_dashboard_legacy_left: "Standard content left"
   label_dashboard_legacy_right: "Standard content right"
+  label_dashboard_lock: Activate dashboard lock
   label_dashboard_lock_is_active: Dashboard lock is active
   label_dashboard_plural: Dashboards
+  label_dashboard_unlock: Remove dashboard lock
   label_day: day
   label_default_sort_by: Default sort by
   label_disable_sidebar: Disable sidebar
@@ -222,3 +224,5 @@ en:
   field_watched_by_me: Watched by me
   label_with_amount: "Amount %{value}"
   label_list_all_entries: "List all %{value}"
+  text_dashboard_lock_confirmation: Are you sure you want to lock this dashboard?
+  text_dashboard_unlock_confirmation: Are you sure you want to unlock this dashboard?
diff --git a/config/locales/es.yml b/config/locales/es.yml
@@ -90,8 +90,10 @@ es:
   label_dashboard_block_info_async: "Este bloque se carga de forma asíncrona y se almacena en caché durante %{time}."
   label_dashboard_legacy_left: "Contenido estándar a la izquierda"
   label_dashboard_legacy_right: "Contenido estándar correcto"
+  label_dashboard_lock: Activar bloqueo del dashboard
   label_dashboard_lock_is_active: "Dashboard bloqueo activo"
   label_dashboard_plural: Dashboards
+  label_dashboard_unlock: Eliminar bloqueo del dashboard
   label_day: día
   label_default_sort_by: "Ordenar por defecto por"
   label_disable_sidebar: "Deshabilitar la barra lateral"
@@ -222,3 +224,5 @@ es:
   field_watched_by_me: "Vigilado por mí"
   label_with_amount: "Importe %{value}"
   label_list_all_entries: "Lista completa %{value}"
+  text_dashboard_lock_confirmation: ¿Está seguro de que desea bloquear este dashboard?
+  text_dashboard_unlock_confirmation: ¿Está seguro de que desea desbloquear este dashboard?
diff --git a/config/locales/fr.yml b/config/locales/fr.yml
@@ -90,8 +90,10 @@ fr:
   label_dashboard_block_info_async: "Ce bloc est chargé de manière asynchrone et mis en cache pendant %{time}."
   label_dashboard_legacy_left: "Contenu standard à gauche"
   label_dashboard_legacy_right: "Droit au contenu standard"
+  label_dashboard_lock: Activer le verrouillage du tableau de bord
   label_dashboard_lock_is_active: "Dashboard blocage est activé"
   label_dashboard_plural: Tableaux de bord
+  label_dashboard_unlock: Supprimer le verrouillage du tableau de bord
   label_day: Jour
   label_default_sort_by: "Tri par défaut"
   label_disable_sidebar: "Désactiver la sidebar"
@@ -222,3 +224,5 @@ fr:
   field_watched_by_me: "Surveillé par moi"
   label_with_amount: "Montant %{value}"
   label_list_all_entries: "Liste complète %{value}"
+  text_dashboard_lock_confirmation: Êtes-vous sûr de vouloir verrouiller ce tableau de bord?
+  text_dashboard_unlock_confirmation: Êtes-vous sûr de vouloir déverrouiller ce tableau de bord?
diff --git a/config/locales/it.yml b/config/locales/it.yml
@@ -90,8 +90,10 @@ it:
   label_dashboard_block_info_async: "Questo blocco viene caricato in modo asincrono e memorizzato nella cache per %{time}."
   label_dashboard_legacy_left: "Contenuto standard a sinistra"
   label_dashboard_legacy_right: "Contenuto standard a destra"
+  label_dashboard_lock: Attiva blocco dashboard
   label_dashboard_lock_is_active: "Dashboard Blocco attivo"
   label_dashboard_plural: Dashboards
+  label_dashboard_unlock: Rimuovi blocco dashboard
   label_day: giorno
   label_default_sort_by: "Ordinamento predefinito per"
   label_disable_sidebar: "Disattivare la barra laterale"
@@ -222,3 +224,5 @@ it:
   field_watched_by_me: "Osservato da me"
   label_with_amount: "Importo %{value}"
   label_list_all_entries: "Elenco di tutti %{value}"
+  text_dashboard_lock_confirmation: Sei sicuro di voler bloccare questa dashboard?
+  text_dashboard_unlock_confirmation: Sei sicuro di voler sbloccare questa dashboard?
diff --git a/config/locales/ja.yml b/config/locales/ja.yml
@@ -90,8 +90,10 @@ ja:
   label_dashboard_block_info_async: のために非同期でブロックがロードされ、キャッシュされます %{time}.
   label_dashboard_legacy_left: "標準インハルト左"
   label_dashboard_legacy_right: "標準コンテンツの権利"
+  label_dashboard_lock: ダッシュボードをロック
   label_dashboard_lock_is_active: "Dashboard ロックが有効"
   label_dashboard_plural: Dashboards
+  label_dashboard_unlock: ダッシュボードのロックを解除
   label_day: "日"
   label_default_sort_by: "デフォルトの並べ替え"
   label_disable_sidebar: "サイドバーを無効にする"
@@ -222,3 +224,5 @@ ja:
   field_watched_by_me: "私が見る"
   label_with_amount: "金額 %{value}"
   label_list_all_entries: "すべて表示 %{value}"
+  text_dashboard_lock_confirmation: このダッシュボードをロックしてもよろしいですか？
+  text_dashboard_unlock_confirmation: このダッシュボードのロックを解除してもよろしいですか？
diff --git a/config/locales/ko.yml b/config/locales/ko.yml
@@ -90,8 +90,10 @@ ko:
   label_dashboard_block_info_async: "이 블록은 비동기식으로 로드되며 %{time}에 대해 캐시됩니다."
   label_dashboard_legacy_left: "표준 콘텐츠 왼쪽"
   label_dashboard_legacy_right: "표준 콘텐츠 권리"
+  label_dashboard_lock: 대시보드 잠금 활성화
   label_dashboard_lock_is_active: "Dashboard 잠금이 활성화됨"
   label_dashboard_plural: Dashboards
+  label_dashboard_unlock: 대시보드 잠금 해제
   label_day: 일
   label_default_sort_by: "기본 정렬 기준"
   label_disable_sidebar: "사이드바 비활성화"
@@ -222,3 +224,5 @@ ko:
   field_watched_by_me: "내가 시청"
   label_with_amount: "금액 %{value}"
   label_list_all_entries: "모두 나열 %{value}"
+  text_dashboard_lock_confirmation: 이 대시보드를 잠그시겠습니까?
+  text_dashboard_unlock_confirmation: 이 대시보드의 잠금을 해제하시겠습니까?
diff --git a/config/locales/pl.yml b/config/locales/pl.yml
@@ -90,8 +90,10 @@ pl:
   label_dashboard_block_info_async: "Ten blok jest ładowany asynchronicznie i buforowany przez %{time}."
   label_dashboard_legacy_left: "Zawartość standardowa lewy"
   label_dashboard_legacy_right: "Zawartość standardowa prawa"
+  label_dashboard_lock: Aktywuj blokadę dashboardu
   label_dashboard_lock_is_active: "Dashboard Blokada jest aktywna"
   label_dashboard_plural: Dashboards
+  label_dashboard_unlock: Usuń blokadę dashboardu
   label_day: "dzień"
   label_default_sort_by: "Domyślne sortowanie według"
   label_disable_sidebar: "Wyłączyć pasek boczny"
@@ -222,3 +224,5 @@ pl:
   field_watched_by_me: "Oglądany przeze mnie"
   label_with_amount: "Kwota %{value}"
   label_list_all_entries: "Wymień wszystkie %{value}"
+  text_dashboard_lock_confirmation: Czy na pewno chcesz zablokować ten dashboard?
+  text_dashboard_unlock_confirmation: Czy na pewno chcesz odblokować ten dashboard?
diff --git a/config/locales/pt-BR.yml b/config/locales/pt-BR.yml
@@ -90,8 +90,10 @@ pt-BR:
   label_dashboard_block_info_async: "Este bloco é carregado assíncrono e colocado em cache por %{time}."
   label_dashboard_legacy_left: "Conteúdo padrão restante"
   label_dashboard_legacy_right: "Direito de conteúdo padrão"
+  label_dashboard_lock: Ativar bloqueio do dashboard
   label_dashboard_lock_is_active: "Dashboard Lock está ativo"
   label_dashboard_plural: Dashboards
+  label_dashboard_unlock: Remover bloqueio do dashboard
   label_day: dia
   label_default_sort_by: "Classificação padrão por"
   label_disable_sidebar: "Desativar sidebar"
@@ -222,3 +224,5 @@ pt-BR:
   field_watched_by_me: "Observado por mim"
   label_with_amount: "Valor %{value}"
   label_list_all_entries: "Listar tudo %{value}"
+  text_dashboard_lock_confirmation: Tem certeza de que deseja bloquear este dashboard?
+  text_dashboard_unlock_confirmation: Tem certeza de que deseja desbloquear este dashboard?
diff --git a/config/locales/ru.yml b/config/locales/ru.yml
@@ -90,8 +90,10 @@ ru:
   label_dashboard_block_info_async: "Этот блок загружается асинхронно и кэшируется на %{time}."
   label_dashboard_legacy_left: "Стандарт-Инхальт налево"
   label_dashboard_legacy_right: "Стандартное право на контент"
+  label_dashboard_lock: Активировать блокировку панели
   label_dashboard_lock_is_active: "Dashboard Блокировка активна"
   label_dashboard_plural: Dashboards
+  label_dashboard_unlock: Снять блокировку панели
   label_day: "день"
   label_default_sort_by: "Сортировка по умолчанию"
   label_disable_sidebar: "отключить боковую панель"
@@ -222,3 +224,5 @@ ru:
   field_watched_by_me: "Под моим наблюдением"
   label_with_amount: "Сумма %{value}"
   label_list_all_entries: "Перечислить все %{value}"
+  text_dashboard_lock_confirmation: Вы уверены, что хотите заблокировать эту панель?
+  text_dashboard_unlock_confirmation: Вы уверены, что хотите разблокировать эту панель?
diff --git a/config/locales/uk.yml b/config/locales/uk.yml
@@ -90,8 +90,10 @@ uk:
   label_dashboard_block_info_async: "Цей блок завантажується асинхронно і кешується на %{time}."
   label_dashboard_legacy_left: "Стандарт-Інхальт наліво"
   label_dashboard_legacy_right: "Стандартне право на контент"
+  label_dashboard_lock: Активувати блокування панелі
   label_dashboard_lock_is_active: "Dashboard Блокування  активне"
   label_dashboard_plural: Dashboards
+  label_dashboard_unlock: Зняти блокування панелі
   label_day: "день"
   label_default_sort_by: "Сортування  по замовчуванню"
   label_disable_sidebar: "Відключити бокову панель"
@@ -222,3 +224,5 @@ uk:
   field_watched_by_me: "Під моїм наглядом"
   label_with_amount: "Сумма %{value}"
   label_list_all_entries: "Перерахувати все %{value}"
+  text_dashboard_lock_confirmation: Ви впевнені, що хочете заблокувати цю панель?
+  text_dashboard_unlock_confirmation: Ви впевнені, що хочете розблокувати цю панель?
diff --git a/config/locales/zh-TW.yml b/config/locales/zh-TW.yml
@@ -90,8 +90,10 @@
   label_dashboard_block_info_async: "这个区块是异步加载的，并缓存到 %{time}."
   label_dashboard_legacy_left: "Standard-Inhalt left"
   label_dashboard_legacy_right: "Standard content right"
+  label_dashboard_lock: 啟用儀表板鎖定
   label_dashboard_lock_is_active: "Dashboard 锁定已激活"
   label_dashboard_plural: Dashboards
+  label_dashboard_unlock: 移除儀表板鎖定
   label_day: 天
   label_default_sort_by: "預設排序方式"
   label_disable_sidebar: Disable sidebar
@@ -222,3 +224,5 @@
   field_watched_by_me: "由我观看"
   label_with_amount: "金額 %{value}"
   label_list_all_entries: "列出所有 %{value}"
+  text_dashboard_lock_confirmation: 您確定要鎖定此儀表板嗎？
+  text_dashboard_unlock_confirmation: 您確定要解鎖此儀表板嗎？
diff --git a/config/locales/zh.yml b/config/locales/zh.yml
@@ -90,8 +90,10 @@ zh:
   label_dashboard_block_info_async: "这个区块是异步加载的，并缓存到 %{time}."
   label_dashboard_legacy_left: "标准左侧内容"
   label_dashboard_legacy_right: "标准右侧内容"
+  label_dashboard_lock: 激活仪表盘锁定
   label_dashboard_lock_is_active: "Dashboard 锁定已激活"
   label_dashboard_plural: 仪表盘
+  label_dashboard_unlock: 移除仪表盘锁定
   label_day: 天
   label_default_sort_by: "默认排序方式"
   label_disable_sidebar: 禁用侧边栏
@@ -222,3 +224,5 @@ zh:
   field_watched_by_me: "由我观看"
   label_with_amount: "金额 %{value}"
   label_list_all_entries: "列出所有 %{value}"
+  text_dashboard_lock_confirmation: 您确定要锁定此仪表盘吗？
+  text_dashboard_unlock_confirmation: 您确定要解锁此仪表盘吗？
diff --git a/config/routes.rb b/config/routes.rb
@@ -14,6 +14,8 @@
       post :add_block
       post :remove_block
       post :order_blocks
+      put :lock
+      put :unlock
     end
   end
 
@@ -24,6 +26,8 @@
         post :add_block
         post :remove_block
         post :order_blocks
+        put :lock
+        put :unlock
       end
     end
     resource :dashboard_async_blocks, only: %i[show create]
diff --git a/test/functional/dashboards_controller_test.rb b/test/functional/dashboards_controller_test.rb
diff --git a/test/unit/dashboard_test.rb b/test/unit/dashboard_test.rb
