jacknudt
/
socialforge
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

#1341修复创新竞赛--用户留言：回复留言显示的是真实姓名的BUG

This commit is contained in:
sw 2014-10-15 17:04:46 +08:00
parent 23ad3f26e4
commit 4b40824111
2 changed files with 1 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
app/views/contests/_history.html.erb
View File

@ -32,7 +32,6 @@
<span> <span>
<% if reply_allow %> <% if reply_allow %>
<%#= link_to(l(:button_quote), {:controller => 'contests', :action => 'new', :id => contest, :journal_id => journal}, :remote => true, :method => 'post', :title => l(:button_quote))%>
<%= link_to(l(:button_quote), <%= link_to(l(:button_quote),
contests_path(:id => contest, contests_path(:id => contest,
:journal_id => journal), :journal_id => journal),
@ -43,15 +42,12 @@
<%= link_to l(:label_bid_respond_quote), <%= link_to l(:label_bid_respond_quote),
'', '',
{:focus => 'project_respond', {:focus => 'project_respond',
:onclick => "toggleAndSettingWordsVal($('##{ids}'), $('##{ids} textarea'), '#{l(:label_reply_plural)} #{journal.user.show_name}: '); $('##{ids} textarea') ;return false;" :onclick => "toggleAndSettingWordsVal($('##{ids}'), $('##{ids} textarea'), '#{l(:label_reply_plural)} #{journal.user}: '); $('##{ids} textarea') ;return false;"
} }
%> %>
<% end %> <% end %>
<% if @user==User.current|| User.current.admin? %> <% if @user==User.current|| User.current.admin? %>
<%#= link_to(l(:label_bid_respond_delete), {:controller => 'bids', :action => 'destroy', :object_id => journal, :id => bid},:confirm => l(:label_delete_confirm),
:remote => true, :method => 'delete', :class => "delete", :confirm => l(:text_are_you_sure), :title => l(:button_delete)) %>
<!-- modified by longjun -->
<%= link_to(l(:label_bid_respond_delete), <%= link_to(l(:label_bid_respond_delete),
words_destroy_path(:user_id => @user, :object_id => journal), words_destroy_path(:user_id => @user, :object_id => journal),

4
app/views/contests/show_contest.html.erb
View File

@ -19,10 +19,6 @@
</p> </p>
<div class="bid_description" style="width: 100%;word-break:break-all;word-wrap: break-word;"> <div class="bid_description" style="width: 100%;word-break:break-all;word-wrap: break-word;">
<%= @contest.description %> <%= @contest.description %>
<!-- <%# if @contest.attachments.any?%>
<%# options = {:author => true} %>
<%#= render :partial => 'attachments/links', :locals => {:attachments => @bid.attachments, :options => options} %>
<%# end %> -->
</div> </div>
<span id="praise_tread" style="float: right"> <span id="praise_tread" style="float: right">
<%= render :partial => "/praise_tread/praise_tread", <%= render :partial => "/praise_tread/praise_tread",