Merge branch 'design_team' into ldap

This commit is contained in:
Christophe Vilayphiou 2012-03-21 13:13:01 +08:00
commit 9f9d0f5bff
1 changed files with 1 additions and 1 deletions

View File

@ -29,7 +29,7 @@
</div>
</td>
<td><%= bulletin.bulletin_category.i18n_variable[I18n.locale] %></td>
<td><%= link_to bulletin.title[I18n.locale], panel_announcement_front_end_bulletin_path(bulletin) rescue ''%></td>
<td><%= link_to bulletin.title[I18n.locale], panel_announcement_front_end_bulletin_path(bulletin, :category_id => bulletin.bulletin_category.id) rescue ''%></td>
<td><%= bulletin.postdate %></td>
<td><%= (bulletin.deadline) ? bulletin.deadline : t('bulletin.no_deadline') %></td>
<td>