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

ip search: add quick links & improve usability

Browse Source 
#2530
This commit is contained in:
Toks
2015-10-08 01:14:48 -04:00
parent f92cfe3b43
commit 643ab7b2c6
8 changed files with 56 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
app/assets/stylesheets/specific/moderator_dashboard.css.scss
View File

@@ -16,6 +16,10 @@ div#c-moderator-dashboards {
div#ip-addr-search { div#ip-addr-search {
margin-bottom: 2em; margin-bottom: 2em;
.hint {
display: block;
}
} }
div#activity-search { div#activity-search {

1
app/controllers/moderator/ip_addrs_controller.rb
View File

@@ -4,6 +4,7 @@ module Moderator
def index def index
@search = IpAddrSearch.new(params[:search]) @search = IpAddrSearch.new(params[:search])
@results = @search.execute
end end
def search def search

6
app/logical/moderator/ip_addr_search.rb
View File

@@ -9,11 +9,11 @@ module Moderator
def execute def execute
if params[:user_id].present? if params[:user_id].present?
search_by_user_id(params[:user_id].split(/,/)) search_by_user_id(params[:user_id].split(/,/).map(&:strip))
elsif params[:user_name].present? elsif params[:user_name].present?
search_by_user_name(params[:user_name].split(/,/)) search_by_user_name(params[:user_name].split(/,/).map(&:strip))
elsif params[:ip_addr].present? elsif params[:ip_addr].present?
search_by_ip_addr(params[:ip_addr].split(/,/)) search_by_ip_addr(params[:ip_addr].split(/,/).map(&:strip))
else else
[] []
end end

6
app/views/moderator/dashboards/_search_ip_addr.html.erb
View File

@@ -2,6 +2,7 @@
<div class="input"> <div class="input">
<label for="user_ids">Search IPs</label> <label for="user_ids">Search IPs</label>
<%= text_field_tag "search[ip_addr]", params[:ip_addrs] %> <%= text_field_tag "search[ip_addr]", params[:ip_addrs] %>
<span class="hint">Separate with commas</span>
</div> </div>
<%= submit_tag "Search" %> <%= submit_tag "Search" %>
@@ -9,8 +10,9 @@
<%= form_tag(moderator_ip_addrs_path, :method => :get, :class => "simple_form") do %> <%= form_tag(moderator_ip_addrs_path, :method => :get, :class => "simple_form") do %>
<div class="input"> <div class="input">
<label for="user_ids">Search User IDs</label> <label for="user_names">Search User Names</label>
<%= text_field_tag "search[user_id]", params[:user_ids] %> <%= text_field_tag "search[user_name]", params[:user_names] %>
<span class="hint">Separate with commas</span>
</div> </div>
<%= submit_tag "Search" %> <%= submit_tag "Search" %>

18
app/views/moderator/ip_addrs/_ip_listing.erb Normal file
View File

@@ -0,0 +1,18 @@
<%= link_to "Perform another search for accounts associated with these IP addresses", moderator_ip_addrs_path(:search => {:ip_addr => @results.map{|k, count| k}.join(",")}) %>
<table class="striped">
<thead>
<tr>
<th>IP Address</th>
<th>Number of Occurrences</th>
</tr>
</thead>
<tbody>
<% @results.each do |ip_address, count| %>
<tr>
<td><%= ip_address %></td>
<td><%= count %></td>
</tr>
<% end %>
</tbody>
</table>

20
app/views/moderator/ip_addrs/_user_listing.erb Normal file
View File

@@ -0,0 +1,20 @@
<%= link_to "Perform another search for IP addresses associated with these accounts", moderator_ip_addrs_path(:search => {:user_id => @results.map{|k, count| k}.join(",")}) %>
<table class="striped">
<thead>
<tr>
<th>User</th>
<th>User ID</th>
<th>Number of Occurrences</th>
</tr>
</thead>
<tbody>
<% @results.each do |user_id, count| %>
<tr>
<td><%= link_to_user User.find(user_id) %></td>
<td><%= user_id %></td>
<td><%= count %></td>
</tr>
<% end %>
</tbody>
</table>

21
app/views/moderator/ip_addrs/index.html.erb
View File

@@ -2,22 +2,11 @@
<div id="a-index"> <div id="a-index">
<h1>IP Addresses</h1> <h1>IP Addresses</h1>
<table class="striped"> <% if params[:search][:user_id].present? || params[:search][:user_name].present? %>
<thead> <%= render "ip_listing" %>
<tr> <% else %>
<th>Key</th> <%= render "user_listing" %>
<th>Count</th> <% end %>
</tr>
</thead>
<tbody>
<% @search.execute.each do |k, count| %>
<tr>
<td><%= k %></td>
<td><%= count %></td>
</tr>
<% end %>
</tbody>
</table>
</div> </div>
</div> </div>

2
app/views/moderator/ip_addrs/search.html.erb
View File

@@ -2,7 +2,7 @@
<div id="a-search"> <div id="a-search">
<h1>Search IP Addresses</h1> <h1>Search IP Addresses</h1>
<%= form_tag(moderator_ip_addrs_path, :class => "simple_form") do %> <%= form_tag(moderator_ip_addrs_path, :method => :get, :class => "simple_form") do %>
<%= search_field "user_name", :label => "User" %> <%= search_field "user_name", :label => "User" %>
<%= search_field "ip_addr", :label => "IP Addr" %> <%= search_field "ip_addr", :label => "IP Addr" %>
<%= submit_tag "Search" %> <%= submit_tag "Search" %>