diff --git a/app/controllers/action/nodes_controller.rb b/app/controllers/action/nodes_controller.rb index e1e7799f4..d85a6094a 100644 --- a/app/controllers/action/nodes_controller.rb +++ b/app/controllers/action/nodes_controller.rb @@ -61,9 +61,9 @@ class Action::NodesController < ApplicationController def node_params if params.require(:action_node) - params.require(:action_node).permit(:name, :full_name, :description, :icon, :action_node_types_id, :is_local, :local_url, :yaml, :sort_no) + params.require(:action_node).permit(:name, :label, :full_name, :description, :icon, :action_node_types_id, :is_local, :local_url, :yaml, :sort_no) else - params.permit(:name, :full_name, :description, :icon, :action_node_types_id, :is_local, :local_url, :yaml, :sort_no) + params.permit(:name, :label, :full_name, :description, :icon, :action_node_types_id, :is_local, :local_url, :yaml, :sort_no) end end end diff --git a/app/models/action/node.rb b/app/models/action/node.rb index 07d3be134..a761a0216 100644 --- a/app/models/action/node.rb +++ b/app/models/action/node.rb @@ -36,6 +36,11 @@ class Action::Node < ApplicationRecord attr_accessor :cust_name, :run_values, :input_values + validates :name, presence: { message: "不能为空" } + validates :full_name, length: { maximum: 200, too_long: "不能超过200个字符" } + validates :label, length: { maximum: 200, too_long: "不能超过200个字符" } + validates :description, length: { maximum: 65535, too_long: "不能超过65535个字符"} + def content_yaml "foo".to_yaml diff --git a/app/models/action/node_input.rb b/app/models/action/node_input.rb index 4f3825170..7dc475a2e 100644 --- a/app/models/action/node_input.rb +++ b/app/models/action/node_input.rb @@ -24,4 +24,7 @@ class Action::NodeInput < ApplicationRecord default_scope { order(sort_no: :asc) } belongs_to :action_node, :class_name => 'Action::Node', foreign_key: "action_nodes_id" + + validates :name, presence: { message: "不能为空" } + validates :description, length: { maximum: 65535, too_long: "不能超过65535个字符"} end diff --git a/app/models/action/node_select.rb b/app/models/action/node_select.rb index 25be51f99..23cd87bb8 100644 --- a/app/models/action/node_select.rb +++ b/app/models/action/node_select.rb @@ -29,6 +29,9 @@ class Action::NodeSelect < ApplicationRecord belongs_to :action_node, :class_name => 'Action::Node', foreign_key: "action_nodes_id" belongs_to :user, optional: true + validates :name, presence: { message: "不能为空" } + validates :description, length: { maximum: 65535, too_long: "不能超过65535个字符"} + def value if self.val_ext.blank? self.val diff --git a/app/models/action/node_type.rb b/app/models/action/node_type.rb index 7ce78b0fb..59f4ab9de 100644 --- a/app/models/action/node_type.rb +++ b/app/models/action/node_type.rb @@ -15,4 +15,7 @@ class Action::NodeType < ApplicationRecord default_scope { order(sort_no: :asc) } has_many :action_nodes, :class_name => 'Action::Node', foreign_key: "action_node_types_id" + + validates :name, presence: { message: "不能为空" } + validates :description, length: { maximum: 65535, too_long: "不能超过65535个字符"} end diff --git a/app/models/action/pipeline.rb b/app/models/action/pipeline.rb index 1dfbd0f24..227fa4aa8 100644 --- a/app/models/action/pipeline.rb +++ b/app/models/action/pipeline.rb @@ -33,5 +33,7 @@ class Action::Pipeline < ApplicationRecord belongs_to :user, optional: true belongs_to :project - + validates :name, presence: { message: "不能为空" } + validates :json, length: { maximum: 65535, too_long: "不能超过65535个字符"} + validates :yaml, length: { maximum: 65535, too_long: "不能超过65535个字符"} end diff --git a/app/models/action/template.rb b/app/models/action/template.rb index 34b669f66..d854e8854 100644 --- a/app/models/action/template.rb +++ b/app/models/action/template.rb @@ -17,4 +17,7 @@ class Action::Template < ApplicationRecord self.table_name = 'action_templates' default_scope { order(sort_no: :asc) } + validates :name, presence: { message: "不能为空" } + validates :description, length: { maximum: 65535, too_long: "不能超过65535个字符"} + end diff --git a/app/views/action/node_inputs/edit.html.erb b/app/views/action/node_inputs/edit.html.erb index 6ae9f8a78..6139eb73f 100644 --- a/app/views/action/node_inputs/edit.html.erb +++ b/app/views/action/node_inputs/edit.html.erb @@ -39,7 +39,7 @@