From a45c7f46bedbe83dcf155a5002e86117216108c0 Mon Sep 17 00:00:00 2001 From: evazion Date: Mon, 23 Mar 2020 00:00:55 -0500 Subject: [PATCH] Interlink bans, ip bans, and user feedbacks pages. * Make the bans, ip bans, ip addresses, and user feedbacks pages all link to one another in the secondary links. * Add quick search bars to the secondary links on these pages. --- app/views/bans/_secondary_links.html.erb | 12 +++++++++++- app/views/ip_bans/_secondary_links.html.erb | 10 +++++++++- .../user_feedbacks/_secondary_links.html.erb | 16 ++++++++++++---- 3 files changed, 32 insertions(+), 6 deletions(-) diff --git a/app/views/bans/_secondary_links.html.erb b/app/views/bans/_secondary_links.html.erb index 679007f7a..5294e3960 100644 --- a/app/views/bans/_secondary_links.html.erb +++ b/app/views/bans/_secondary_links.html.erb @@ -1,4 +1,14 @@ <% content_for(:secondary_links) do %> + <%= quick_search_form_for(:user_name, bans_path, "users", autocomplete: "user") %> <%= subnav_link_to "Listing", bans_path %> - <%= subnav_link_to "Ban", new_ban_path %> + <% if policy(IpAddress).index? %> + <%= subnav_link_to "IP Addresses", ip_addresses_path %> + <% end %> + <% if policy(IpBan).index? %> + <%= subnav_link_to "IP Bans", ip_bans_path %> + <% end %> + <%= subnav_link_to "Feedbacks", user_feedbacks_path %> + <% if policy(Ban.new).create? %> + | <%= subnav_link_to "Ban", new_ban_path %> + <% end %> <% end %> diff --git a/app/views/ip_bans/_secondary_links.html.erb b/app/views/ip_bans/_secondary_links.html.erb index f5375e834..3259f1c0f 100644 --- a/app/views/ip_bans/_secondary_links.html.erb +++ b/app/views/ip_bans/_secondary_links.html.erb @@ -1,4 +1,12 @@ <% content_for(:secondary_links) do %> + <%= quick_search_form_for(:ip_addr, ip_bans_path, "ip addresses") %> <%= subnav_link_to "Listing", ip_bans_path %> - <%= subnav_link_to "New", new_ip_ban_path %> + <% if policy(IpAddress).index? %> + <%= subnav_link_to "IP Addresses", ip_addresses_path %> + <% end %> + <%= subnav_link_to "Bans", ip_bans_path %> + <%= subnav_link_to "Feedbacks", user_feedbacks_path %> + <% if policy(IpBan).create? %> + | <%= subnav_link_to "New", new_ip_ban_path %> + <% end %> <% end %> diff --git a/app/views/user_feedbacks/_secondary_links.html.erb b/app/views/user_feedbacks/_secondary_links.html.erb index 6a52bfb9d..23ae7f3af 100644 --- a/app/views/user_feedbacks/_secondary_links.html.erb +++ b/app/views/user_feedbacks/_secondary_links.html.erb @@ -1,12 +1,20 @@ <% content_for(:secondary_links) do %> + <%= quick_search_form_for(:user_name, user_feedbacks_path, "users", autocomplete: "user") %> + <%= subnav_link_to "Listing", user_feedbacks_path %> + <% if policy(IpAddress).index? %> + <%= subnav_link_to "IP Addresses", ip_addresses_path %> + <% end %> + <% if policy(IpBan).index? %> + <%= subnav_link_to "IP Bans", ip_bans_path %> + <% end %> + <%= subnav_link_to "Bans", ip_bans_path %> <% if policy(UserFeedback.new).create? %> <% if @user_feedback.present? && policy(@user_feedback).create? %> - <%= subnav_link_to "New", new_user_feedback_path(:user_feedback => {:user_id => @user_feedback.user_id}) %> + | <%= subnav_link_to "New", new_user_feedback_path(:user_feedback => {:user_id => @user_feedback.user_id}) %> <% elsif params[:search] && params[:search][:user_id] %> - <%= subnav_link_to "New", new_user_feedback_path(:user_feedback => {:user_id => params[:search][:user_id]}) %> + | <%= subnav_link_to "New", new_user_feedback_path(:user_feedback => {:user_id => params[:search][:user_id]}) %> <% else %> - <%= subnav_link_to "New", new_user_feedback_path %> + | <%= subnav_link_to "New", new_user_feedback_path %> <% end %> <% end %> - <%= subnav_link_to "Listing", user_feedbacks_path %> <% end %>