From 4be2d817c9c28e3af8649dd63b62ac805c71d301 Mon Sep 17 00:00:00 2001 From: xxq250 Date: Thu, 16 Jan 2025 15:22:08 +0800 Subject: [PATCH 1/3] =?UTF-8?q?fixed:=20fork=EF=BC=8Cpr=E5=90=AF=E5=8A=A8?= =?UTF-8?q?=E8=AF=AD=E6=B3=95=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/api/v1/projects/pipelines/build_pipeline.yaml.erb | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/app/views/api/v1/projects/pipelines/build_pipeline.yaml.erb b/app/views/api/v1/projects/pipelines/build_pipeline.yaml.erb index cda797b1a..4d3bf7738 100644 --- a/app/views/api/v1/projects/pipelines/build_pipeline.yaml.erb +++ b/app/views/api/v1/projects/pipelines/build_pipeline.yaml.erb @@ -6,7 +6,7 @@ on: <% node.input_values.each_key do |key| %> <%=key %>: <% if node.input_values[key].blank? %> - - * + - '*' <% else %> <% node.input_values[key].to_s.split(",").each do |val| %> - <%=val %> @@ -19,10 +19,10 @@ on: <% node.input_values.each_key do |key| %> <%=key %>: <% if node.input_values[key].blank? %> - - * + - '*' <% else %> <% node.input_values[key].to_s.split(",").each do |val| %> - - <%=val %> + - <%=val %> <% end %> <% end %> <% end %> From 71a8d67515cb4176aaa9af3e099e8b6fdf215729 Mon Sep 17 00:00:00 2001 From: xxq250 Date: Fri, 17 Jan 2025 10:43:31 +0800 Subject: [PATCH 2/3] =?UTF-8?q?fixed:=20=E6=9C=AA=E5=88=86=E7=B1=BB?= =?UTF-8?q?=E5=A4=84=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/controllers/action/nodes_controller.rb | 2 ++ 1 file changed, 2 insertions(+) diff --git a/app/controllers/action/nodes_controller.rb b/app/controllers/action/nodes_controller.rb index c995513da..a891b2a29 100644 --- a/app/controllers/action/nodes_controller.rb +++ b/app/controllers/action/nodes_controller.rb @@ -5,7 +5,9 @@ class Action::NodesController < ApplicationController def index @node_types = Action::NodeType.all + no_node_type = Action::NodeType.find_by(name: "未分类") @no_type_nodes = Action::Node.where(action_node_types_id: nil) + @no_type_nodes = Action::Node.where(action_node_types_id: nil).or(where(action_node_types_id: no_node_type.id)) if no_node_type.present? respond_to do |format| format.html { @nodes = Action::Node.where("name LIKE :search OR full_name LIKE :search", :search => "%#{params[:search]}%") } format.json From e3d21199f57930e2555c74a99b4407624f4a7e2f Mon Sep 17 00:00:00 2001 From: xxq250 Date: Fri, 17 Jan 2025 10:45:37 +0800 Subject: [PATCH 3/3] =?UTF-8?q?fixed:=20=E6=9C=AA=E5=88=86=E7=B1=BB?= =?UTF-8?q?=E5=A4=84=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/controllers/action/nodes_controller.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/controllers/action/nodes_controller.rb b/app/controllers/action/nodes_controller.rb index a891b2a29..67eb70c2f 100644 --- a/app/controllers/action/nodes_controller.rb +++ b/app/controllers/action/nodes_controller.rb @@ -7,7 +7,7 @@ class Action::NodesController < ApplicationController @node_types = Action::NodeType.all no_node_type = Action::NodeType.find_by(name: "未分类") @no_type_nodes = Action::Node.where(action_node_types_id: nil) - @no_type_nodes = Action::Node.where(action_node_types_id: nil).or(where(action_node_types_id: no_node_type.id)) if no_node_type.present? + @no_type_nodes = Action::Node.where(action_node_types_id: nil).or(Action::Node.where(action_node_types_id: no_node_type.id)) if no_node_type.present? respond_to do |format| format.html { @nodes = Action::Node.where("name LIKE :search OR full_name LIKE :search", :search => "%#{params[:search]}%") } format.json