作业内回复改为实名回复
This commit is contained in:
parent
175ac86217
commit
760203ebc7
|
@ -46,7 +46,7 @@
|
||||||
</div>
|
</div>
|
||||||
<div style="clear: both;"></div>
|
<div style="clear: both;"></div>
|
||||||
<div>
|
<div>
|
||||||
<%= 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 } %>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
<div class="cl"></div>
|
<div class="cl"></div>
|
||||||
|
|
|
@ -1,7 +1,8 @@
|
||||||
|
|
||||||
<% id = "journal_reply_ul_" + journal.id.to_s%>
|
<% id = "journal_reply_ul_" + journal.id.to_s%>
|
||||||
|
<% show_real_name ||= false%>
|
||||||
<div id = '<%= id %>' >
|
<div id = '<%= id %>' >
|
||||||
<% fetch_user_leaveWord_reply(journal).each do |reply|%>
|
<% 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 %>
|
<% end %>
|
||||||
</div>
|
</div>
|
||||||
|
|
|
@ -1,3 +1,4 @@
|
||||||
|
<% show_real_name ||= false %>
|
||||||
<% reply_allow = JournalsForMessage.create_by_user? User.current %>
|
<% reply_allow = JournalsForMessage.create_by_user? User.current %>
|
||||||
<% ids_r = 'reply_respond_form_'+ reply.id.to_s %>
|
<% ids_r = 'reply_respond_form_'+ reply.id.to_s %>
|
||||||
<div class="recall" id='word_li_<%=reply.id.to_s%>' onmouseover="$('#<%= ids_r %>').show()" onmouseout="$('#<%= ids_r %>').hide()">
|
<div class="recall" id='word_li_<%=reply.id.to_s%>' onmouseover="$('#<%= ids_r %>').show()" onmouseout="$('#<%= ids_r %>').hide()">
|
||||||
|
@ -10,11 +11,19 @@
|
||||||
</div>
|
</div>
|
||||||
<div class="recall_con">
|
<div class="recall_con">
|
||||||
<% id = 'project_respond_form_'+ reply.id.to_s %>
|
<% 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 %>
|
<% parent_jour = JournalsForMessage.find reply.m_reply_id %>
|
||||||
<% if show_name && parent_jour %>
|
<% 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 %>
|
<% else %>
|
||||||
<%= l(:label_anonymous) %>
|
<%= l(:label_anonymous) %>
|
||||||
<% end %>
|
<% end %>
|
||||||
|
|
Loading…
Reference in New Issue