This commit is contained in:
wanglinchun 2014-06-05 14:58:24 +08:00
parent 6abdce1e59
commit f1555bf134
3 changed files with 4 additions and 4 deletions

View File

@ -296,9 +296,9 @@ class ApplicationController < ActionController::Base
end end
def find_contest_from_association def find_contest_from_association
render_404 unless @contest.present? render_404 unless @object.present?
@contest = @contest.contest @contest =@object.contest
end end
def find_model_object def find_model_object

View File

@ -48,7 +48,7 @@
<tr> <tr>
<td align="left"><span class="font_lighter"> <%= l :label_update_time %> <td align="left"><span class="font_lighter"> <%= l :label_update_time %>
&nbsp;<%= format_time(contestnotifications.created_at) %></span></td> &nbsp;<%= format_time(contestnotifications.created_at) %></span></td>
<td width="350" align="right" class="a"><%= link_to l(:label_project_newother), contest_contestnotification_path(@contest, contestnotifications) %><%= "(#{l(:label_x_comments, :count => contestnotifications.notificationcomments_count)})" if(contestnotifications.notificationcomments_count >= 0)%></td> <td width="350" align="right" class="a"><%= link_to l(:label_project_newother), contest_contestnotification_path(@contest, contestnotifications) %><%#= "(#{l(:label_x_comments, :count => contestnotifications.notificationcomments_count)})" if contestnotifications.notificationcomments_count >= 0 %></td>
</tr> </tr>
</table> </table>
</td> </td>

View File

@ -64,7 +64,7 @@
<tr> <tr>
<td align="left"><span class="font_lighter"> <%= l :label_update_time %> <td align="left"><span class="font_lighter"> <%= l :label_update_time %>
&nbsp;<%= format_time(news.created_on) %></span></td> &nbsp;<%= format_time(news.created_on) %></span></td>
<td width="350" align="right" class="a"><%= link_to l(:label_project_newother), news_path(news) %><%= "(#{l(:label_x_comments, :count => news.comments_count)})" if news.comments_count >= 0 %></td>
</tr> </tr>
</table> </table>
</td> </td>