erictyl
/
feeds
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

will display merged category

This commit is contained in:
Harry Bomrah 2016-04-12 14:23:43 +08:00
parent 091bdf271f
commit 0931662e3c
2 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
app/models/site_feed.rb
View File

@ -13,5 +13,10 @@ class SiteFeed
field :feed_uid field :feed_uid
scope :enabled, ->{where(:disabled => false)} scope :enabled, ->{where(:disabled => false)}
def category
Category.find(self.merge_with_category) rescue nil
end
end end

1
app/views/admin/feeds/index.html.erb
View File

@ -51,6 +51,7 @@
<ul class="channel-sublist"> <ul class="channel-sublist">
<li class="channel-subitem" > <li class="channel-subitem" >
<span class="channel-feedname"><%= channel.feed_name %></span> <span class="channel-feedname"><%= channel.feed_name %></span>
<span class="label label-info"><%= channel.category.title rescue "" %></span>
<span class="channel-actions"> <span class="channel-actions">
<button class="btn <%= channel.disabled ? "btn-info" : "btn-warning" %> btn-small disable-feed-btn" data-feed-id="<%= channel.id.to_s %>"><%= channel.disabled ? "Enable" : "Disable" %></button> <button class="btn <%= channel.disabled ? "btn-info" : "btn-warning" %> btn-small disable-feed-btn" data-feed-id="<%= channel.id.to_s %>"><%= channel.disabled ? "Enable" : "Disable" %></button>
<button class="btn btn-danger btn-small unsubscribe-btn" data-feed-uid="<%= channel.feed_uid %>" data-feed-name="<%= channel.feed_name %>">Unsubscribe</button> <button class="btn btn-danger btn-small unsubscribe-btn" data-feed-uid="<%= channel.feed_uid %>" data-feed-name="<%= channel.feed_name %>">Unsubscribe</button>