From 949a3ac4a1f2b8cd952370c9f04958fe75832da5 Mon Sep 17 00:00:00 2001 From: mingming Date: Sat, 18 May 2024 22:52:49 +0800 Subject: [PATCH 1/2] fix(dashboard): fix ProjectSystemDefaultChangeException when allowed_projects.count is one --- app/views/dashboards/_form.html.slim | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/views/dashboards/_form.html.slim b/app/views/dashboards/_form.html.slim index 50cb41c9..1ffe8371 100644 --- a/app/views/dashboards/_form.html.slim +++ b/app/views/dashboards/_form.html.slim @@ -12,7 +12,7 @@ = hidden_field_tag 'dashboard[dashboard_type]', @dashboard.dashboard_type if @dashboard.new_record? - if @project = hidden_field_tag 'dashboard[content_project_id]', @project.id - - if @allowed_projects.present? && @allowed_projects.count > 1 + - if @allowed_projects.present? && @allowed_projects.count > 0 p = f.select :project_id, project_tree_options_for_select(@allowed_projects, From 4e7ca72b5d7b3c2f5cf5e86b4b3c85cd11d8de9c Mon Sep 17 00:00:00 2001 From: mingming Date: Sat, 18 May 2024 23:15:15 +0800 Subject: [PATCH 2/2] fix(dashboard): fix linter error --- app/views/dashboards/_form.html.slim | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/views/dashboards/_form.html.slim b/app/views/dashboards/_form.html.slim index 1ffe8371..0b1a999d 100644 --- a/app/views/dashboards/_form.html.slim +++ b/app/views/dashboards/_form.html.slim @@ -12,7 +12,7 @@ = hidden_field_tag 'dashboard[dashboard_type]', @dashboard.dashboard_type if @dashboard.new_record? - if @project = hidden_field_tag 'dashboard[content_project_id]', @project.id - - if @allowed_projects.present? && @allowed_projects.count > 0 + - if @allowed_projects.present? && @allowed_projects.count.positive? p = f.select :project_id, project_tree_options_for_select(@allowed_projects,