diff --git a/app/views/homework_attach/_jour.html.erb b/app/views/homework_attach/_jour.html.erb index d6a1f7fc4..055e1a015 100644 --- a/app/views/homework_attach/_jour.html.erb +++ b/app/views/homework_attach/_jour.html.erb @@ -46,7 +46,7 @@
- <%= render :partial => "words/journal_reply", :locals => {:journal => jour,:show_name=> show_name } %> + <%= render :partial => "words/journal_reply", :locals => {:journal => jour,:show_name=> show_name, :show_real_name => true } %>
diff --git a/app/views/words/_journal_reply.html.erb b/app/views/words/_journal_reply.html.erb index 39321394c..2f823ebf6 100644 --- a/app/views/words/_journal_reply.html.erb +++ b/app/views/words/_journal_reply.html.erb @@ -1,7 +1,8 @@ <% id = "journal_reply_ul_" + journal.id.to_s%> +<% show_real_name ||= false%>
<% fetch_user_leaveWord_reply(journal).each do |reply|%> - <%= render :partial => "words/journal_reply_items", :locals => {:reply => reply, :journal => journal, :m_reply_id => reply,:show_name=> show_name} %> + <%= render :partial => "words/journal_reply_items", :locals => {:reply => reply, :journal => journal, :m_reply_id => reply,:show_name=> show_name, :show_real_name => show_real_name} %> <% end %>
diff --git a/app/views/words/_journal_reply_items.html.erb b/app/views/words/_journal_reply_items.html.erb index d2c94b094..ebca999a6 100644 --- a/app/views/words/_journal_reply_items.html.erb +++ b/app/views/words/_journal_reply_items.html.erb @@ -1,3 +1,4 @@ +<% show_real_name ||= false %> <% reply_allow = JournalsForMessage.create_by_user? User.current %> <% ids_r = 'reply_respond_form_'+ reply.id.to_s %>
@@ -10,11 +11,19 @@
<% id = 'project_respond_form_'+ reply.id.to_s %> - <%= link_to reply.user.name, user_path(reply.user) %> + <% if show_real_name%> + <%= link_to reply.user.lastname+reply.user.firstname, user_path(reply.user) %> + <% else %> + <%= link_to reply.user.name, user_path(reply.user) %> + <% end %> 回复 <% parent_jour = JournalsForMessage.find reply.m_reply_id %> <% if show_name && parent_jour %> - <%= link_to parent_jour.user.name,user_path(parent_jour.user) %> + <% if show_real_name%> + <%= link_to parent_jour.user.lastname+reply.user.firstname, user_path(parent_jour.user) %> + <% else %> + <%= link_to parent_jour.user.name, user_path(parent_jour.user) %> + <% end %> <% else %> <%= l(:label_anonymous) %> <% end %>