lib/engine2/action/infra.rb in engine2-1.0.8 vs lib/engine2/action/infra.rb in engine2-1.0.9
- old
+ new
@@ -22,11 +22,11 @@
run_scheme :login!, user_info_model
run_scheme :logout!
define_node :inspect_modal, InspectModalAction do
access! &:logged_in?
- define_node :inspect, WebSocketAction.inherit do
+ define_node :"inspect_#{SETTINGS[:name]}", WebSocketAction.inherit do
self.* do
@action_type = :inspect
ws_message do |msg, ws|
ws.send! number: msg[:number].to_i + 1
@@ -110,11 +110,12 @@
file = handler.params[:file]
temp = file[:tempfile]
temp.close
rackname = File.basename(temp.path)
info = node.parent.*.model.type_info[node.parent.*.field]
- File.rename(temp.path, "#{info[:store][:upload]}/#{rackname}")
+ FileUtils.cp(temp.path, "#{info[:store][:upload]}/#{rackname}") # File.rename(temp.path, "#{info[:store][:upload]}/#{rackname}")
+ FileUtils.rm(temp.path)
{rackname: rackname}
end
end
class BlobStoreAction < Action
@@ -231,12 +232,12 @@
def invoke handler
user = handler.user
{user: user ? user.to_hash : nil}
end
- def login_meta show_login_otion = 'false', &blk
+ def login_meta menu_properties = {show: 'false'}, &blk
node.login_form.* &blk
- menu(:menu).modify_option :login_form, show: show_login_otion
+ menu(:menu).modify_option :login_form, menu_properties
node.parent.login_form.* &blk
end
end
class InspectModalAction < Action