首页申请加入竞赛的消息报500

This commit is contained in:
cxt 2017-02-22 10:01:54 +08:00
parent e6deabadba
commit 422b5ffa95
3 changed files with 4 additions and 2 deletions

View File

@ -36,7 +36,7 @@
<%= link_to '管理员身份', switch_role_contest_path(@contest, :user_id => User.current.id, :curr_role => 14, :tar_role => 13), :class => "fr sy_btn_blue mt28 ml10", :title => "由评委身份切换至管理员身份" %>
<% end %>
<% end %>
<% else %>
<% elsif User.current.logged? %>
<%= link_to "加入竞赛",join_contest_contests_path(),:remote => true, :method => "get", :class => "fr sy_btn_blue mt28 ml10" %>
<% end %>
<span class="fr mt30 f16"> 邀请码:

View File

@ -116,6 +116,7 @@
$("#navHomepageSearchType").hide();
});
<% unless @force %>
$("#user_messages").mouseenter(function(){
onNotice = true;
$("#user_messages_list").show();
@ -134,6 +135,7 @@
obj.html("<%=escape_javascript(render :partial => 'layouts/message_loading') %>");
} }, 500);
});
<% end %>
$("#message_list_detail").mouseenter(function(event){
event.stopPropagation();
onUserMessages = true;

View File

@ -25,7 +25,7 @@
<%=link_to user.show_name, user_path(user),
:class => "newsBlue homepageNewsPublisher", :target => '_blank' %></span>
<span class="homepageNewsType fl">
<%= user.user_extensions.school_id.blank? ? "" : "来自"+user.user_extensions.school.name+"" %>
<%= user.user_extensions.school_id.blank? || user.user_extensions.school.nil? ? "" : "来自"+user.user_extensions.school.name+"" %>
申请以"<%= role_str%>"的身份加入竞赛:
</span>
</li>