Merge branch 'standalone_develop' of https://gitlink.org.cn/Trustie/forgeplus into standalone_develop
This commit is contained in:
commit
b35093e47a
|
@ -5,7 +5,9 @@ class Action::NodesController < ApplicationController
|
||||||
|
|
||||||
def index
|
def index
|
||||||
@node_types = Action::NodeType.all
|
@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)
|
||||||
|
@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|
|
respond_to do |format|
|
||||||
format.html { @nodes = Action::Node.where("name LIKE :search OR full_name LIKE :search", :search => "%#{params[:search]}%") }
|
format.html { @nodes = Action::Node.where("name LIKE :search OR full_name LIKE :search", :search => "%#{params[:search]}%") }
|
||||||
format.json
|
format.json
|
||||||
|
|
|
@ -6,7 +6,7 @@ on:
|
||||||
<% node.input_values.each_key do |key| %>
|
<% node.input_values.each_key do |key| %>
|
||||||
<%=key %>:
|
<%=key %>:
|
||||||
<% if node.input_values[key].blank? %>
|
<% if node.input_values[key].blank? %>
|
||||||
- *
|
- '*'
|
||||||
<% else %>
|
<% else %>
|
||||||
<% node.input_values[key].to_s.split(",").each do |val| %>
|
<% node.input_values[key].to_s.split(",").each do |val| %>
|
||||||
- <%=val %>
|
- <%=val %>
|
||||||
|
@ -19,10 +19,10 @@ on:
|
||||||
<% node.input_values.each_key do |key| %>
|
<% node.input_values.each_key do |key| %>
|
||||||
<%=key %>:
|
<%=key %>:
|
||||||
<% if node.input_values[key].blank? %>
|
<% if node.input_values[key].blank? %>
|
||||||
- *
|
- '*'
|
||||||
<% else %>
|
<% else %>
|
||||||
<% node.input_values[key].to_s.split(",").each do |val| %>
|
<% node.input_values[key].to_s.split(",").each do |val| %>
|
||||||
- <%=val %>
|
- <%=val %>
|
||||||
<% end %>
|
<% end %>
|
||||||
<% end %>
|
<% end %>
|
||||||
<% end %>
|
<% end %>
|
||||||
|
|
Loading…
Reference in New Issue