修复某些课程动态内容为空的BUG #1128

app/views/users/show.html.erb

@@ -43,6 +43,7 @@
             <% (Rails.logger.error "[Error] =========================================================> NameError: uninitialized constant " + e.act_type.to_s; next;) if e.act_type.safe_constantize.nil? %>
             <% act = e.act %>
             <% unless act.nil? %>
+                <% if e.act_type == 'JournalsForMessage' || e.act_type == 'Bid' || e.act_type == 'Journal'|| e.act_type == 'Changeset' || e.act_type == 'Message' || e.act_type == 'Principal' || e.act_type == 'News' || e.act_type == 'Issue' || e.act_type == 'Contest'%>
                     <table width="660" border="0" align="left" style="border-bottom: 1px dashed rgb(204, 204, 204); margin-bottom: 10px;font-size:14px;">
                         <tr>
                         <td colspan="2" valign="top" width="50"><%= image_tag(url_to_avatar(e.user), :class => "avatar") %></td>
@@ -323,12 +324,14 @@
                                 </div>
                             </tr>
                         <% else %>
-                    <% f=1 %>
+                            <%# f=1 %>
                             <% end %><!-- < % #case end %> -->
                         </table>
                         </td>
                         </tr>
+
                     </table>
+                <% end %>
                 <% end %><!-- < % #unless act.nil? end %> -->
 
             <% end %><!-- < % #@activity.each do |e| end%> -->

config/locales/en.yml

@@ -1801,3 +1801,4 @@ en:
   modal_valid_passing: can be used.
 
   label_company_name: Company Name
+  notice_account_invalid_creditentials_new: You have not to the mailbox activation