diff --git a/app/views/layouts/_show_messages_list.html.erb b/app/views/layouts/_show_messages_list.html.erb index 300cc0879..d7887434f 100644 --- a/app/views/layouts/_show_messages_list.html.erb +++ b/app/views/layouts/_show_messages_list.html.erb @@ -115,7 +115,7 @@ <%= link_to content.html_safe, { :controller=> "my",:action => "account", :flag => 1, :applied_message_id => ma.id }, :title => "系统提示:“#{ma.name}”的申请,经确认为无效的单位信息,已被删除,请重新编辑您的单位资料。谢谢!", :target => '_blank'%> <% end %> - <% elsif ma.class == ForgeMessage %> + <% elsif ma.class == ForgeMessage && ma.forge_message %> <% if ma.forge_message_type == "AppliedProject" %>
  • " target="_blank" title="<%=ma.forge_message.user.show_name %> 申请加入项目:<%= ma.project.name%>"><%=ma.forge_message.user.show_name %> 申请加入项目:<%= ma.project.name%>
  • <% elsif ma.forge_message_type == "JoinProject" %> diff --git a/app/views/users/_user_message_forge.html.erb b/app/views/users/_user_message_forge.html.erb index 7a5fa17c9..d08396e16 100644 --- a/app/views/users/_user_message_forge.html.erb +++ b/app/views/users/_user_message_forge.html.erb @@ -1,4 +1,4 @@ -<% if ma.class == ForgeMessage %> +<% if ma.class == ForgeMessage && ma.forge_message %> <% if ma.forge_message_type == "AppliedProject" %>