Merge remote-tracking branch 'origin/dev_zanle' into dev_zanle

This commit is contained in:
lizanle 2015-12-15 18:12:49 +08:00
commit b7ae8d866f
1 changed files with 152 additions and 152 deletions

View File

@ -19,7 +19,7 @@
</span>
</div>
<div class="homepagePostSubmitContainer">
<div class="homepagePostAssignTo">指派给&nbsp;&nbsp;
<div class="homepagePostAssignTo"><span class="fontGrey3">指派给</span>&nbsp;&nbsp;
<% unless activity.assigned_to_id.nil? %>
<% if activity.try(:assigned_to).try(:realname) == ' ' %>
<%= link_to activity.try(:assigned_to), user_path(activity.assigned_to_id), :class => "newsBlue mr15" %>