IntenseWebs/discourse
3
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2025-02-25 18:55:32 -06:00
Code Issues Packages Projects Releases Wiki Activity

FEATURE: show tags in crawler view of tags page for static site

Browse Source 
Previously tags page would have an empty page in crawler view
This commit is contained in:
Saurabh Patel 2019-06-06 08:25:37 +05:30 committed by Sam
parent c3a38d2304
commit b510006ca8
3 changed files with 80 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
app/controllers/tags_controller.rb
View File

@ -27,13 +27,6 @@ class TagsController < ::ApplicationController
@description_meta = I18n.t("tags.title") @description_meta = I18n.t("tags.title")
@title = @description_meta @title = @description_meta
respond_to do |format|
format.html do
render :index
end
format.json do
show_all_tags = guardian.can_admin_tags? && guardian.is_admin? show_all_tags = guardian.can_admin_tags? && guardian.is_admin?
if SiteSetting.tags_listed_by_group if SiteSetting.tags_listed_by_group
@ -44,10 +37,8 @@ class TagsController < ::ApplicationController
{ id: tag_group.id, name: tag_group.name, tags: self.class.tag_counts_json(tag_group.tags) } { id: tag_group.id, name: tag_group.name, tags: self.class.tag_counts_json(tag_group.tags) }
end end
render json: { @tags = self.class.tag_counts_json(ungrouped_tags)
tags: self.class.tag_counts_json(ungrouped_tags), @extras = { tag_groups: grouped_tag_counts }
extras: { tag_groups: grouped_tag_counts }
}
else else
tags = show_all_tags ? Tag.all : Tag.where("tags.topic_count > 0") tags = show_all_tags ? Tag.all : Tag.where("tags.topic_count > 0")
unrestricted_tags = DiscourseTagging.filter_visible(tags, guardian) unrestricted_tags = DiscourseTagging.filter_visible(tags, guardian)
@ -60,11 +51,21 @@ class TagsController < ::ApplicationController
{ id: c.id, tags: self.class.tag_counts_json(c.tags) } { id: c.id, tags: self.class.tag_counts_json(c.tags) }
end end
render json: { @tags = self.class.tag_counts_json(unrestricted_tags)
tags: self.class.tag_counts_json(unrestricted_tags), @extras = { categories: category_tag_counts }
extras: { categories: category_tag_counts }
}
end end
respond_to do |format|
format.html do
render :index
end
format.json do
render json: {
tags: @tags,
extras: @extras
}
end end
end end
end end

6
app/views/tags/_tag.html.erb Normal file
View File

@ -0,0 +1,6 @@
<div class="tag-box">
<a href="<%= Discourse.base_url %>/tags/<%= tag[:id] %>" class="discourse-tag simple"><%= tag[:text] %></a>
<% if tag[:count] && tag[:count] > 0 %>
<span class="tag-count">x <%= tag[:count] %></span>
<% end %>
</div>

42
app/views/tags/index.html.erb
View File

@ -1,3 +1,45 @@
<% content_for :head do %> <% content_for :head do %>
<%= raw crawlable_meta_data(title: @title, description: @description_meta) %> <%= raw crawlable_meta_data(title: @title, description: @description_meta) %>
<% end %> <% end %>
<div class="tag-crawler">
<% if @extras[:categories] %>
<% @extras[:categories].each do |category| %>
<div class="tag-list">
<% if category[:name] %>
<h3><%= category[:name] %></h3>
<% end %>
<% category[:tags].each do |tag| %>
<%= render "tag", tag: tag %>
<% end %>
</div>
<div class="clearfix"></div>
<% end %>
<% end %>
<% if @extras[:tag_groups] %>
<% @extras[:tag_groups].each do |tag_group| %>
<div class="tag-list">
<% if tag_group[:name] %>
<h3><%= tag_group[:name] %></h3>
<% end %>
<% tag_group[:tags].each do |tag| %>
<%= render "tag", tag: tag %>
<% end %>
</div>
<div class="clearfix"></div>
<% end %>
<% end %>
<% if @tags.present? %>
<div class="tag-list">
<h3><%= t 'js.tagging.other_tags' %></h3>
<% @tags.each do |tag| %>
<%= render "tag", tag: tag %>
<% end %>
</div>
<div class="clearfix"></div>
<% end %>
</div>