diff --git a/app/controllers/related_tags_controller.rb b/app/controllers/related_tags_controller.rb index ec86073aa..af329c0f7 100644 --- a/app/controllers/related_tags_controller.rb +++ b/app/controllers/related_tags_controller.rb @@ -2,7 +2,10 @@ class RelatedTagsController < ApplicationController respond_to :json, :xml, :js, :html def show - @query = RelatedTagQuery.new(query: params[:query], category: params[:category], user: CurrentUser.user) + query = params[:query] || search_params[:query] + category = params[:category] || search_params[:category] + + @query = RelatedTagQuery.new(query: query, category: category, user: CurrentUser.user) respond_with(@query) end end diff --git a/app/views/admin/alias_and_implication_imports/new.html.erb b/app/views/admin/alias_and_implication_imports/new.html.erb index fa700e3d5..014def208 100644 --- a/app/views/admin/alias_and_implication_imports/new.html.erb +++ b/app/views/admin/alias_and_implication_imports/new.html.erb @@ -2,7 +2,7 @@

Alias & Implication Import

- <%= form_tag(admin_alias_and_implication_import_path, :class => "simple_form") do %> + <%= simple_form_for(:batch, url: admin_alias_and_implication_import_path) do |f| %>
 Use the following format:
 
@@ -13,28 +13,10 @@ create implication aaa -> bbb
 mass update aaa -> bbb
       
-
- - <%= text_area "batch", "text", :size => "60x20" %> -
- -
- - <%= text_field "batch", "forum_id" %> -
- -
- -
- - <%= submit_tag %> + <%= f.input :text, label: "Script", as: :text, input_html: { size: "60x20" } %> + <%= f.input :forum_id, label: "Forum ID" %> + <%= f.input :rename_aliased_pages, label: "Renamed aliased wiki pages and artists", as: :boolean, checked: true %> + <%= f.submit "Submit" %> <% end %>
diff --git a/app/views/moderator/tags/edit.html.erb b/app/views/moderator/tags/edit.html.erb index 630310e1e..54de9a314 100644 --- a/app/views/moderator/tags/edit.html.erb +++ b/app/views/moderator/tags/edit.html.erb @@ -2,20 +2,10 @@

Mass Edit

- <%= form_tag(moderator_tag_path, :method => :put, :class => "simple_form") do %> -
- - <%= text_field :tag, :antecedent, :value => params[:antecedent], :data => { :autocomplete => "tag-query" } %> -
- -
- - <%= text_field :tag, :consequent, :value => params[:consequent], :data => { :autocomplete => "tag-edit" } %> -
- -
- <%= submit_tag "Submit" %> -
+ <%= simple_form_for(:tag, url: moderator_tag_path, method: :put) do |f| %> + <%= f.input :antecedent, input_html: { value: params[:antecedent], "data-autocomplete": "tag-query" } %> + <%= f.input :consequent, input_html: { value: params[:consequent], "data-autocomplete": "tag-edit" } %> + <%= f.submit "Submit" %> <% end %>
diff --git a/app/views/related_tags/show.html.erb b/app/views/related_tags/show.html.erb index e8cbe0fdc..6165fb161 100644 --- a/app/views/related_tags/show.html.erb +++ b/app/views/related_tags/show.html.erb @@ -1,14 +1,14 @@