diff --git a/app/views/tag_aliases/index.html.erb b/app/views/tag_aliases/index.html.erb index d0b046162..c9fcf0b22 100644 --- a/app/views/tag_aliases/index.html.erb +++ b/app/views/tag_aliases/index.html.erb @@ -1,13 +1,6 @@
- <%= simple_form_for(:search, method: :get, url: tag_aliases_path, defaults: { required: false }, html: { class: "inline-form" }) do |f| %> - <%= f.input :name_matches, label: "Name", input_html: { value: params[:search][:name_matches], data: { autocomplete: "tag" } } %> - <%= f.input :status, label: "Status", collection: ["", "Approved", "Pending", "Retired"], selected: params[:search][:status] %> - <%= f.input :category, label: "Category", collection: TagCategory.canonical_mapping.to_a, include_blank: true, selected: params[:search][:category] %> - <%= f.input :order, label: "Order", collection: [%w[Status status], %w[Recently\ created created_at], %w[Recently\ updated updated_at], %w[Name name], %w[Tag\ count tag_count]], selected: params[:search][:order] %> - <%= f.submit "Search" %> - <% end %> - + <%= render "tag_relationships/search", url: tag_aliases_path %> <%= render "listing", :tag_aliases => @tag_aliases %> <%= numbered_paginator(@tag_aliases) if @tag_aliases.respond_to?(:current_page) %> diff --git a/app/views/tag_implications/index.html.erb b/app/views/tag_implications/index.html.erb index 0127bc75c..1b93e2458 100644 --- a/app/views/tag_implications/index.html.erb +++ b/app/views/tag_implications/index.html.erb @@ -1,13 +1,6 @@
- <%= simple_form_for(:search, method: :get, url: tag_implications_path, defaults: { required: false }, html: { class: "inline-form" }) do |f| %> - <%= f.input :name_matches, label: "Name", input_html: { value: params[:search][:name_matches], data: { autocomplete: "tag" } } %> - <%= f.input :status, label: "Status", collection: ["", "Approved", "Pending", "Retired"], selected: params[:search][:status] %> - <%= f.input :category, label: "Category", collection: TagCategory.canonical_mapping.to_a, include_blank: true, selected: params[:search][:category] %> - <%= f.input :order, label: "Order", collection: [%w[Status status], %w[Recently\ created created_at], %w[Recently\ updated updated_at], %w[Name name], %w[Tag\ count tag_count]], selected: params[:search][:order] %> - <%= f.submit "Search" %> - <% end %> - + <%= render "tag_relationships/search", url: tag_implications_path %> <%= render "listing", :tag_implications => @tag_implications %> <%= numbered_paginator(@tag_implications) %> diff --git a/app/views/tag_relationships/_search.html.erb b/app/views/tag_relationships/_search.html.erb new file mode 100644 index 000000000..54caea5ac --- /dev/null +++ b/app/views/tag_relationships/_search.html.erb @@ -0,0 +1,9 @@ +<%# url %> + +<%= simple_form_for(:search, method: :get, url: url, defaults: { required: false }, html: { class: "inline-form" }) do |f| %> + <%= f.input :name_matches, label: "Name", input_html: { value: params[:search][:name_matches], data: { autocomplete: "tag" } } %> + <%= f.input :status, label: "Status", collection: %w[Approved Active Pending Deleted Retired Processing Queued], include_blank: true, selected: params[:search][:status] %> + <%= f.input :category, label: "Category", collection: TagCategory.canonical_mapping.to_a, include_blank: true, selected: params[:search][:category] %> + <%= f.input :order, label: "Order", collection: [%w[Status status], %w[Recently\ created created_at], %w[Recently\ updated updated_at], %w[Name name], %w[Tag\ count tag_count]], selected: params[:search][:order] %> + <%= f.submit "Search" %> +<% end %>