leo
/
announcement-test
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

category fix

This commit is contained in:
Harry Bomrah 2014-12-11 17:41:42 +08:00
parent 7f511aee91
commit 4123610d32
2 changed files with 19 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/controllers/announcements_controller.rb
View File

@ -95,6 +95,8 @@ class AnnouncementsController < ApplicationController
return {} return {}
end end
return {} if announcement.category.disable
tags = announcement.tags.map{|tag| { tags = announcement.tags.map{|tag| {
"tag" => tag.name , "tag" => tag.name ,
"url" => OrbitHelper.page_for_tag(tag) "url" => OrbitHelper.page_for_tag(tag)

20
app/views/admin/announcements/_index.html.erb
View File

@ -16,14 +16,28 @@
<td> <td>
<%= b.status_for_table %> <%= b.status_for_table %>
</td> </td>
<td><%= b.category.title %></td> <td>
<%= b.category.title rescue "" %>
<% if (b.category.disable rescue false) %>
<span class='label'><%= t(:disabled) %></span>
<% end %>
</td>
<td> <td>
<% if b.expired? %> <% if b.expired? %>
<%= b.title %> <span class='label'><%= t(:expired) %></span> <%= b.title %> <span class='label'><%= t(:expired) %></span>
<% elsif !b.approved? %> <% elsif !b.approved? %>
<a href="<%=page_for_bulletin(b)%>" target="_blank"><%= b.title %></a> <span class='label'><%= t(:pending) %></span> <% if (b.category.disable rescue false)%>
<%= b.title %>
<% else %>
<a href="<%=page_for_bulletin(b)%>" target="_blank"><%= b.title %></a>
<% end %>
<span class='label'><%= t(:pending) %></span>
<% else %> <% else %>
<a href="<%=page_for_bulletin(b)%>" target="_blank"><%= b.title %></a> <% if (b.category.disable rescue false) %>
<%= b.title %>
<% else %>
<a href="<%=page_for_bulletin(b)%>" target="_blank"><%= b.title %></a>
<% end %>
<% end %> <% end %>
<div class="quick-edit"> <div class="quick-edit">
<ul class="nav nav-pills"> <ul class="nav nav-pills">