alex
/
orbit4-5
forked from saurabh/orbit4-5
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

added a msg for module frontend problem

This commit is contained in:
Harry Bomrah 2014-07-16 15:21:04 +08:00
parent 2f3e60b0df
commit 0cca5ec1b2
2 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
app/helpers/application_helper.rb
View File

@ -230,7 +230,7 @@ module ApplicationHelper
end
html.html_safe
else
""
return "<div>It seems we have a problem with the module at this point of time, we will try to fix it as soon as possible, Sorry for the inconvenience!! :( </div>"
end
else
f = File.join(Rails.root, 'app', 'templates', "#{@key}", 'modules', params[:target_controller].singularize, "#{params[:target_action]}.html.erb")
@ -239,9 +239,12 @@ module ApplicationHelper
doc = Nokogiri::HTML(file, nil, "UTF-8")
file.close
controller = "#{params[:target_controller].capitalize}_controller".classify.constantize.new
data = controller.send("#{params[:target_action]}")
data = controller.send("#{params[:target_action]}") rescue nil
if data.nil?
return "<div>It seems we have a problem with the module at this point of time, we will try to fix it as soon as possible, Sorry for the inconvenience!! :( </div>"
end
if data.blank? || data.empty? || data.nil?
if data.blank? || data.empty?
file = File.open("#{Rails.root}/public/404.html")
doc = Nokogiri::HTML(file, nil, "UTF-8")
file.close

2
app/helpers/pages_helper.rb
View File

@ -78,7 +78,7 @@ module PagesHelper
end
html.html_safe
else
""
return "<div>It seems we have a problem with the module at this point of time, we will try to fix it as soon as possible, Sorry for the inconvenience!! :( </div>"
end
end