From 7765fa0839ce844569e12737cb5564b57f632144 Mon Sep 17 00:00:00 2001 From: Alex <40072887+alexdcrane@users.noreply.github.com> Date: Mon, 22 Sep 2025 09:46:42 -0600 Subject: [PATCH] Dashboard Widget Edit: Only show parent widgets in parent setting dropdown list (#7496) * Dashboard Widget Edit: Only show parent widgets in parent setting dropdown list * Update app_languages.php --- core/dashboard/app_languages.php | 52 ++++++++++++------------ core/dashboard/dashboard_widget_edit.php | 7 ++-- 2 files changed, 30 insertions(+), 29 deletions(-) diff --git a/core/dashboard/app_languages.php b/core/dashboard/app_languages.php index 2a5b26d79a..8a55f7d7e7 100644 --- a/core/dashboard/app_languages.php +++ b/core/dashboard/app_languages.php @@ -1728,32 +1728,32 @@ $text['label-dashboard_widget_parent_uuid']['zh-cn'] = "父母"; $text['label-dashboard_widget_parent_uuid']['ja-jp'] = "親"; $text['label-dashboard_widget_parent_uuid']['ko-kr'] = "부모"; -$text['description-dashboard_widget_parent_uuid']['en-us'] = "Select the parent dashboard."; -$text['description-dashboard_widget_parent_uuid']['en-gb'] = "Select the parent dashboard."; -$text['description-dashboard_widget_parent_uuid']['ar-eg'] = "حدد لوحة التحكم الرئيسية."; -$text['description-dashboard_widget_parent_uuid']['de-at'] = "Wählen Sie das übergeordnete Dashboard aus."; -$text['description-dashboard_widget_parent_uuid']['de-ch'] = "Wählen Sie das übergeordnete Dashboard aus."; -$text['description-dashboard_widget_parent_uuid']['de-de'] = "Wählen Sie das übergeordnete Dashboard aus."; -$text['description-dashboard_widget_parent_uuid']['el-gr'] = "Επιλέξτε τον αρχικό πίνακα ελέγχου."; -$text['description-dashboard_widget_parent_uuid']['es-cl'] = "Seleccione el tablero principal."; -$text['description-dashboard_widget_parent_uuid']['es-mx'] = "Seleccione el tablero principal."; -$text['description-dashboard_widget_parent_uuid']['fr-ca'] = "Sélectionnez le tableau de bord parent."; -$text['description-dashboard_widget_parent_uuid']['fr-fr'] = "Sélectionnez le tableau de bord parent."; -$text['description-dashboard_widget_parent_uuid']['he-il'] = "בחר את לוח המחוונים הראשי."; -$text['description-dashboard_widget_parent_uuid']['it-it'] = "Seleziona la dashboard principale."; -$text['description-dashboard_widget_parent_uuid']['ka-ge'] = "აირჩიეთ მშობელი სამუშაო პანელი."; -$text['description-dashboard_widget_parent_uuid']['nl-nl'] = "Selecteer het hoofddashboard."; -$text['description-dashboard_widget_parent_uuid']['pl-pl'] = "Wybierz główny pulpit nawigacyjny."; -$text['description-dashboard_widget_parent_uuid']['pt-br'] = "Selecione o painel principal."; -$text['description-dashboard_widget_parent_uuid']['pt-pt'] = "Selecione o painel principal."; -$text['description-dashboard_widget_parent_uuid']['ro-ro'] = "Selectați tabloul de bord principal."; -$text['description-dashboard_widget_parent_uuid']['ru-ru'] = "Выберите основную панель."; -$text['description-dashboard_widget_parent_uuid']['sv-se'] = "Välj huvuddashboarden."; -$text['description-dashboard_widget_parent_uuid']['uk-ua'] = "Виберіть головну панель."; -$text['description-dashboard_widget_parent_uuid']['tr-tr'] = "Ana panoyu seçin."; -$text['description-dashboard_widget_parent_uuid']['zh-cn'] = "选择父仪表板。"; -$text['description-dashboard_widget_parent_uuid']['ja-jp'] = "親ダッシュボードを選択します。"; -$text['description-dashboard_widget_parent_uuid']['ko-kr'] = "상위 대시보드를 선택하십시오."; +$text['description-dashboard_widget_parent_uuid']['en-us'] = "Select the parent widget."; +$text['description-dashboard_widget_parent_uuid']['en-gb'] = "Select the parent widget."; +$text['description-dashboard_widget_parent_uuid']['ar-eg'] = "اختر القطعة الويب الأم."; +$text['description-dashboard_widget_parent_uuid']['de-at'] = "Wählen Sie das übergeordnete Widget aus."; +$text['description-dashboard_widget_parent_uuid']['de-ch'] = "Wählen Sie das übergeordnete Widget aus."; +$text['description-dashboard_widget_parent_uuid']['de-de'] = "Wählen Sie das übergeordnete Widget aus."; +$text['description-dashboard_widget_parent_uuid']['el-gr'] = "Επιλέξτε το γονικό widget."; +$text['description-dashboard_widget_parent_uuid']['es-cl'] = "Seleccione el widget padre."; +$text['description-dashboard_widget_parent_uuid']['es-mx'] = "Seleccione el widget padre."; +$text['description-dashboard_widget_parent_uuid']['fr-ca'] = "Sélectionnez le widget parent."; +$text['description-dashboard_widget_parent_uuid']['fr-fr'] = "Sélectionnez le widget parent."; +$text['description-dashboard_widget_parent_uuid']['he-il'] = "אנא בחר את القطعة האב."; +$text['description-dashboard_widget_parent_uuid']['it-it'] = "Seleziona il widget genitore."; +$text['description-dashboard_widget_parent_uuid']['ka-ge'] = "აირჩიეთ მშობლიურ ვიჯეტი."; +$text['description-dashboard_widget_parent_uuid']['nl-nl'] = "Selecteer het bovenliggende widget."; +$text['description-dashboard_widget_parent_uuid']['pl-pl'] = "Wybierz widget nadrzędny."; +$text['description-dashboard_widget_parent_uuid']['pt-br'] = "Selecione o widget pai."; +$text['description-dashboard_widget_parent_uuid']['pt-pt'] = "Selecione o widget pai."; +$text['description-dashboard_widget_parent_uuid']['ro-ro'] = "Selectați widgetul părinte."; +$text['description-dashboard_widget_parent_uuid']['ru-ru'] = "Выберите родительский виджет."; +$text['description-dashboard_widget_parent_uuid']['sv-se'] = "Välj det överordnade widgeten."; +$text['description-dashboard_widget_parent_uuid']['uk-ua'] = "Виберіть батьківський віджет."; +$text['description-dashboard_widget_parent_uuid']['tr-tr'] = "Ebeveyn widget'i seçin."; +$text['description-dashboard_widget_parent_uuid']['zh-cn'] = "选择父级小部件。"; +$text['description-dashboard_widget_parent_uuid']['ja-jp'] = "親ウィンドウ젯を選択します。"; +$text['description-dashboard_widget_parent_uuid']['ko-kr'] = "부모 위젯을 선택합니다."; $text['label-widget_order']['en-us'] = "Order"; $text['label-widget_order']['en-gb'] = "Order"; diff --git a/core/dashboard/dashboard_widget_edit.php b/core/dashboard/dashboard_widget_edit.php index 4c5adf926d..b78cc1d7c4 100644 --- a/core/dashboard/dashboard_widget_edit.php +++ b/core/dashboard/dashboard_widget_edit.php @@ -500,7 +500,7 @@ //get the groups $sql = "SELECT group_uuid, domain_uuid, group_name FROM v_groups "; - $sql .= "WHERE (domain_uuid = :domain_uuid or domain_uuid is null)"; + $sql .= "WHERE (domain_uuid = :domain_uuid or domain_uuid is null) "; $sql .= "ORDER BY domain_uuid desc, group_name asc "; $parameters['domain_uuid'] = $_SESSION['domain_uuid']; $groups = $database->execute($sql, $parameters, 'all'); @@ -508,9 +508,10 @@ //get the dashboards $sql = "SELECT dashboard_widget_uuid, widget_name FROM v_dashboard_widgets "; - $sql .= "WHERE dashboard_widget_parent_uuid is null "; + $sql .= "WHERE widget_path = 'dashboard/parent' "; + $sql .= "AND dashboard_uuid = :dashboard_uuid "; $sql .= "ORDER by widget_order, widget_name asc "; - $parameters = null; + $parameters['dashboard_uuid'] = $dashboard_uuid; $widget_parents = $database->execute($sql, $parameters, 'all'); unset ($sql, $parameters);