Skip to content

Commit

Permalink
[webui] Replace ugly map with generic escape_nested_list helper
Browse files Browse the repository at this point in the history
Cherry picked from master
30eac56
  • Loading branch information
ChrisBr committed Oct 30, 2015
1 parent 0dee834 commit 688dd77
Showing 1 changed file with 5 additions and 8 deletions.
13 changes: 5 additions & 8 deletions src/api/app/views/webui/home/index.html.erb
Original file line number Diff line number Diff line change
Expand Up @@ -77,9 +77,8 @@
:project => 'REPLACEPRJ',
:package => 'REPLACEPKG') %> ">
<% content_for :ready_function do %>
var ipackages = [ <%= @ipackages.map {|p|
"['#{p[0]}','#{escape_javascript(p[1])}']" }.join(",\n").html_safe %> ];
renderPackagesProjectsTable({packages: ipackages, length: '15', name: 'ipackages_wrapper'});
var ipackages = [ <%= escape_nested_list(@ipackages) %> ];
renderPackagesProjectsTable({packages: ipackages, length: 15, name: 'ipackages_wrapper'});
<% end %>
</div>
<% else %>
Expand All @@ -93,8 +92,7 @@
<% else %>
<div id="projects_table_wrapper" data-url="<%= url_for(controller: 'project', action: 'show', project: 'REPLACEIT') %>">
<% content_for :head_javascript do %>
var main_projects = [ <%= @iprojects.map {|p|
"['#{p[0]}','#{escape_javascript(p[1])}']" }.join(",\n").html_safe %> ];
var main_projects = [ <%= escape_nested_list(@iprojects) %> ];
var excl_projects = [];
<% end %>
<% content_for :ready_function do %>
Expand All @@ -114,9 +112,8 @@
:project => 'REPLACEPRJ',
:package => 'REPLACEPKG') %> ">
<% content_for :ready_function do %>
var iowned = [ <%= @owned.map {|p|
"['#{p[1]}','#{escape_javascript(p[0])}']" }.join(",\n").html_safe %> ];
renderPackagesProjectsTable({packages: iowned, length: '15', name: 'iowned_wrapper'});
var iowned = [ <%= escape_nested_list(@owned) %> ];
renderPackagesProjectsTable({packages: iowned, length: 15, name: 'iowned_wrapper'});
<% end %>
</div>
<% end %>
Expand Down

0 comments on commit 688dd77

Please sign in to comment.