jaculabilis/danbooru
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

fix for tag blacklists, typo fixes

Browse Source
This commit is contained in:
albert
2013-02-17 02:19:33 -05:00
parent 5ac578adf3
commit 2b0857a3cd
7 changed files with 16 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/views/layouts/default.html.erb
View File

@@ -9,7 +9,7 @@
<meta name="current-user-id" content="<%= CurrentUser.id %>">
<meta name="user-comment-threshold" content="<%= CurrentUser.comment_threshold %>">
<% unless CurrentUser.user.blacklisted_tags.blank? %>
<meta name="blacklisted-tags" content="<%= CurrentUser.user.blacklisted_tags %>">
<meta name="blacklisted-tags" content="<%= CurrentUser.user.blacklisted_tag_array.to_json %>">
<% end %>
<% if flash[:notice] =~ /error/ %>
<meta name="errors" content="true">

2
app/views/legacy/tags.xml.erb
View File

@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<tags type="array">
<% @tags.each do |tag| %>
<tag name="<%= tag.name %>" id="<%= tag.id %>" ambiguous="false" created_at="<%= tag.created_at.strftime('%Y-%m-%d %H:%M') %>" count="<%= tag.post_count %>" type="<%= tag.category %>"></user>
<tag name="<%= tag.name %>" id="<%= tag.id %>" ambiguous="false" created_at="<%= tag.created_at.try(:strftime, '%Y-%m-%d %H:%M') %>" count="<%= tag.post_count %>" type="<%= tag.category %>"></user>
<% end %>
</tags>

2
app/views/tags/search.html.erb
View File

@@ -5,7 +5,7 @@
<div class="input">
<label for="search_category">Category</label>
<%= select "search", "category", Tag.canonical_tag_category_mapping.to_a %>
<%= select "search", "category", Danbooru.config.canonical_tag_category_mapping.to_a %>
</div>
<div class="input">