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

fix a Ruby issue

This commit is contained in:
manson 2014-08-05 15:53:08 +08:00
parent 2ca408294e
commit 43e1a669d6
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/helpers/application_helper.rb
View File

@ -185,7 +185,6 @@ module ApplicationHelper
if d[data_name] if d[data_name]
d[data_name].each_with_index do |item,i| d[data_name].each_with_index do |item,i|
element = el.inner_html element = el.inner_html
element = render_link_to_edit(element, item['url_to_edit']) if !item['url_to_edit'].nil?
if wrap_elements.count > 0 if wrap_elements.count > 0
htmls = parsing_repeats_again(wrap_elements,d[data_name][i], level + 1) htmls = parsing_repeats_again(wrap_elements,d[data_name][i], level + 1)
htmls[0].each_with_index do |html,i| htmls[0].each_with_index do |html,i|
@ -197,6 +196,7 @@ module ApplicationHelper
value = value.nil? ? "" : value value = value.nil? ? "" : value
element = element.gsub("{{#{key}}}",value.to_s) element = element.gsub("{{#{key}}}",value.to_s)
element = element.gsub("%7B%7B#{key}%7D%7D",value.to_s) element = element.gsub("%7B%7B#{key}%7D%7D",value.to_s)
element = render_link_to_edit(element, value) if key.eql?("url_to_edit")
end end
end end
html_to_render = html_to_render + element html_to_render = html_to_render + element

6
app/helpers/pages_helper.rb
View File

@ -12,7 +12,7 @@ module PagesHelper
end end
def render_widget_for_frontend(controller_name, widget_method, widget_file) def render_widget_for_frontend(controller_name, widget_method, widget_file)
def parsing_repeats_again(elements,d,level) def widget_parsing_repeats_again(elements,d,level)
newhtml = [] newhtml = []
oldhtml = [] oldhtml = []
elements.each do |el| elements.each do |el|
@ -23,7 +23,7 @@ module PagesHelper
d["#{data_name}"].each_with_index do |item,i| d["#{data_name}"].each_with_index do |item,i|
element = el.inner_html element = el.inner_html
if wrap_elements.count > 0 if wrap_elements.count > 0
htmls = parsing_repeats_again(wrap_elements,d["#{data_name}"][i], level + 1) htmls = widget_parsing_repeats_again(wrap_elements,d["#{data_name}"][i], level + 1)
htmls[0].each_with_index do |html,i| htmls[0].each_with_index do |html,i|
element = element.gsub(html,htmls[1][i]) element = element.gsub(html,htmls[1][i])
end end
@ -70,7 +70,7 @@ module PagesHelper
data = controller.send("#{widget_method}") rescue nil data = controller.send("#{widget_method}") rescue nil
if !data.nil? if !data.nil?
wrap_elements = doc.css("*[data-list][data-level='0']") wrap_elements = doc.css("*[data-list][data-level='0']")
htmls = parsing_repeats_again(wrap_elements,data,1) htmls = widget_parsing_repeats_again(wrap_elements,data,1)
html = doc.to_s html = doc.to_s
htmls[0].each_with_index do |h,i| htmls[0].each_with_index do |h,i|
html = html.gsub(h,htmls[1][i]) html = html.gsub(h,htmls[1][i])