app/views/admin/overview/index.html.erb in spree_dash-0.50.4 vs app/views/admin/overview/index.html.erb in spree_dash-0.60.0.RC1

- old
+ new

@@ -139,27 +139,27 @@ </div> <% end %> <p style="clear:both;">&nbsp;</p> <% else %> <%= hook :admin_dashboard_welcome do %> - <%= raw t('overview_welcome') %> + <%== t('overview_welcome') %> <% end %> <% end %> <% end %> <% content_for :head do %> <%= hook :admin_dashboard_javascript do %> <% if @show_dashboard %> <script type="text/javascript"> - var orders_by_day_points = [[<%= raw @orders_by_day.map { |day| "[\"#{day[0]}\",#{day[1]}]" }.join(",") %>]]; - var best_selling_variants_points = [<%= raw @best_selling_variants.map { |v| "[\"#{v[0]}\",#{v[1]}]" }.join(",") %>]; - var top_grossing_variants_points = [<%= raw @top_grossing_variants.map { |v| "[\"#{v[0]}\",#{v[1]}]" }.join(",") %>]; - var best_selling_taxons_points = [<%= raw @best_selling_taxons.map { |t| "[\"#{t[0]}\",#{t[1]}]" }.join(",") %>]; + var orders_by_day_points = [[<%== @orders_by_day.map { |day| "[\"#{day[0]}\",#{day[1]}]" }.join(",") %>]]; + var best_selling_variants_points = [<%== @best_selling_variants.map { |v| "[\"#{h(v[0])}\",#{v[1]}]" }.join(",") %>]; + var top_grossing_variants_points = [<%== @top_grossing_variants.map { |v| "[\"#{h(v[0])}\",#{v[1]}]" }.join(",") %>]; + var best_selling_taxons_points = [<%== @best_selling_taxons.map { |t| "[\"#{h(t[0])}\",#{t[1]}]" }.join(",") %>]; var orders = "<%= t(:orders) %>"; var by_day = "<%= t(:by_day) %>"; - var pie_colors = [<%= raw @pie_colors.map{|c| "'#{c}'"}.join(",") %>]; + var pie_colors = [<%== @pie_colors.map{|c| "'#{c}'"}.join(",") %>]; </script> <%= javascript_include_tag 'jqPlot/jquery.jqplot.min.js', 'jqPlot/plugins/jqplot.dateAxisRenderer.min.js', 'jqPlot/plugins/jqplot.highlighter.min.js', 'jqPlot/plugins/jqplot.canvasAxisTickRenderer.min.js', 'jqPlot/plugins/jqplot.canvasTextRenderer.min.js', 'jqPlot/plugins/jqplot.canvasAxisLabelRenderer.min.js', 'jqPlot/plugins/jqplot.pieRenderer.min.js', 'dashboard.js' %>