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

Merge branch 'subscription-queries'

Browse Source
This commit is contained in:
Toks
2013-09-17 11:01:12 -04:00
parent fe63689425 05a1da1b40
commit fbc0819bdb
5 changed files with 26 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/views/tag_subscriptions/_form.html.erb
View File

@@ -1,6 +1,6 @@
<%= simple_form_for(@tag_subscription) do |f| %>
<%= f.input :name %>
<%= f.input :tag_query %>
<%= f.input :tag_query, :hint => "Put separate tag combinations on separate lines." %>
<div class="input">
<label for="tag_subscription_is_public">
<%= check_box "tag_subscription", "is_public" %>

4
app/views/tag_subscriptions/index.html.erb
View File

@@ -14,7 +14,7 @@
<% @tag_subscriptions.each do |tag_subscription| %>
<tr>
<td><%= tag_subscription.pretty_name %></td>
<td><%= tag_subscription.tag_query %></td>
<td><%= tag_subscription.pretty_tag_query %></td>
<td><%= tag_subscription.post_id_array.size %></td>
<td>
<%= link_to "edit", edit_tag_subscription_path(tag_subscription) %>
@@ -26,7 +26,7 @@
</tbody>
</table>
<p class="info">You can create up to <%= Danbooru.config.max_tag_subscriptions %> subscriptions with up to 20 tags each.</p>
<p class="info">You can create up to <%= Danbooru.config.max_tag_subscriptions %> subscriptions with up to 20 queries each.</p>
</div>
</div>