Merge pull request #555 from warpc/554-json_generation_fix

[issue #554] Fixed tab+space json bug in AJAX.
This commit is contained in:
Vladimir Sharshov 2012-07-04 06:58:47 -07:00
commit f9a9e75b91
2 changed files with 2 additions and 2 deletions

View File

@ -6,7 +6,7 @@
<% @projects.each do |project| %>
[
"<%=j link_to("#{project.owner.respond_to?(:uname) ? project.owner.uname : project.owner.name} / #{project.name}", project) %>",
"<%= truncate(project.description || '', :length => 60).gsub("\n", ' ').gsub("\r", ' ') %>",
"<%= truncate(project.description || '', :length => 60).gsub(/\n|\r|\t/, ' ') %>",
"<%=j link_to t("layout.add"), url_for(:controller => :repositories, :action => :add_project, :project_id => project.id) %>"
]<%= project == @projects.last ? '' : ',' %>
<% end %>

View File

@ -13,7 +13,7 @@
j(link_to("#{project.owner.respond_to?(:uname) ? project.owner.uname : project.owner.name} / #{project.name}", project)) +
"</div>").html_safe
%>",
"<%= truncate(project.description || '', :length => 60).gsub("\n", ' ').gsub("\r", ' ') %>",
"<%= truncate(project.description || '', :length => 60).gsub(/\n|\r|\t/, ' ') %>",
"<%=
if can? :remove_project, @repository
j(link_to('<span class="delete">&nbsp;</span>'.html_safe,