Merge branch 'sidebar_config' into ntu
Conflicts: app/controllers/admin/object_auths_new_interface_controller.rb app/controllers/orbit_backend_controller.rb app/controllers/orbit_widget_controller.rb app/models/module_app.rb app/views/admin/page_parts/_module_widget.html.erb config/locales/zh_tw.yml lib/parsers/parser_common.rb lib/parsers/parser_front_end.rb
This commit is contained in:
commit
76296ab29b
160 files changed
+8659
-1037
No files matched your search
@@ -0,0 +1,14 @@
|
||||
|
||||
# require "#{File.dirname(__FILE__)}/module_app_error_handler.rb"
|
||||
# require "#{File.dirname(__FILE__)}/object_auth_error_handler.rb"
|
||||
# require "#{File.dirname(__FILE__)}/module_app_error_handler.rb"
|
||||
# require "#{File.dirname(__FILE__)}/page_error_handler.rb"
|
||||
|
||||
|
||||
# module OrbitApp
|
||||
# module ErrorHandlers
|
||||
# module ApplicationsErrorHandler
|
||||
|
||||
# end
|
||||
# end
|
||||
# end
|
||||
@@ -0,0 +1,17 @@
|
||||
module OrbitApp
|
||||
module ErrorHandlers
|
||||
module ModuleAppErrorHandler
|
||||
|
||||
|
||||
def render_module_app_error(exception = nil)
|
||||
default_message = 'ModuleAppErrorHandler'
|
||||
meaasge = ''
|
||||
|
||||
if exception
|
||||
meaasge = default_message +" " + exception.message
|
||||
end
|
||||
render :text=>meaasge
|
||||
end
|
||||
end
|
||||
end
|
||||
end
|
||||
@@ -0,0 +1,16 @@
|
||||
module OrbitApp
|
||||
module ErrorHandlers
|
||||
module ObjectAuthErrorHandler
|
||||
|
||||
|
||||
def render_object_auth_error(exception = nil)
|
||||
default_message = 'This is a render_object_auth_error'
|
||||
meaasge = ''
|
||||
if exception
|
||||
meaasge = default_message +" " + exception.message
|
||||
end
|
||||
render :text=>meaasge
|
||||
end
|
||||
end
|
||||
end
|
||||
end
|
||||
@@ -0,0 +1,16 @@
|
||||
module OrbitApp
|
||||
module ErrorHandlers
|
||||
module PageErrorHandler
|
||||
|
||||
|
||||
def render_page_error(exception = nil)
|
||||
default_message = 'ModuleAppErrorHandler'
|
||||
meaasge = ''
|
||||
if exception
|
||||
meaasge = default_message +" " + exception.message
|
||||
end
|
||||
render :text=>meaasge
|
||||
end
|
||||
end
|
||||
end
|
||||
end
|
||||
Reference in new issue
Block a user