consul/nairobi
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Use a generic name for the search parameter

Browse Source 
This way we can use it for any model.
This commit is contained in:
Javi Martín
2020-12-03 11:17:45 +01:00
parent 9a24a8efe2
commit 155da08cf0
26 changed files with 55 additions and 49 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/components/admin/search_component.html.erb
View File

@@ -1,7 +1,7 @@
<div class="small-12 medium-6">
<%= form_tag(url, method: :get) do |f| %>
<div class="input-group">
<%= text_field_tag :name_or_email, params[:name_or_email].to_s, placeholder: t("admin.shared.user_search.placeholder") %>
<%= text_field_tag :search, search_terms.to_s, placeholder: t("admin.shared.user_search.placeholder") %>
<div class="input-group-button">
<%= submit_tag t("admin.shared.user_search.button"), class: "button" %>
</div>

6
app/components/admin/search_component.rb
View File

@@ -4,4 +4,10 @@ class Admin::SearchComponent < ApplicationComponent
def initialize(url:)
@url = url
end
private
def search_terms
params[:search]
end
end

2
app/controllers/admin/administrators_controller.rb
View File

@@ -6,7 +6,7 @@ class Admin::AdministratorsController < Admin::BaseController
end
def search
@users = User.search(params[:name_or_email])
@users = User.search(params[:search])
.includes(:administrator)
.page(params[:page])
.for_render

2
app/controllers/admin/managers_controller.rb
View File

@@ -6,7 +6,7 @@ class Admin::ManagersController < Admin::BaseController
end
def search
@users = User.search(params[:name_or_email])
@users = User.search(params[:search])
.includes(:manager)
.page(params[:page])
.for_render

2
app/controllers/admin/moderators_controller.rb
View File

@@ -6,7 +6,7 @@ class Admin::ModeratorsController < Admin::BaseController
end
def search
@users = User.search(params[:name_or_email])
@users = User.search(params[:search])
.includes(:moderator)
.page(params[:page])
.for_render

2
app/controllers/admin/officials_controller.rb
View File

@@ -4,7 +4,7 @@ class Admin::OfficialsController < Admin::BaseController
end
def search
@users = User.search(params[:name_or_email]).page(params[:page]).for_render
@users = User.search(params[:search]).page(params[:page]).for_render
end
def edit

2
app/controllers/admin/organizations_controller.rb
View File

@@ -12,7 +12,7 @@ class Admin::OrganizationsController < Admin::BaseController
def search
@organizations = Organization.includes(:user)
.search(params[:term])
.search(params[:search])
.order("users.created_at", :name, "users.email")
.page(params[:page])
end

2
app/controllers/admin/poll/officers_controller.rb
View File

@@ -6,7 +6,7 @@ class Admin::Poll::OfficersController < Admin::Poll::BaseController
end
def search
@user = User.find_by(email: params[:email])
@user = User.find_by(email: params[:search])
respond_to do |format|
if @user

2
app/controllers/admin/valuators_controller.rb
View File

@@ -10,7 +10,7 @@ class Admin::ValuatorsController < Admin::BaseController
end
def search
@users = User.search(params[:name_or_email])
@users = User.search(params[:search])
.includes(:valuator)
.page(params[:page])
.for_render

2
app/controllers/admin/verifications_controller.rb
View File

@@ -4,7 +4,7 @@ class Admin::VerificationsController < Admin::BaseController
end
def search
@users = User.incomplete_verification.search(params[:name_or_email])
@users = User.incomplete_verification.search(params[:search])
.page(params[:page])
.for_render
render :index

2
app/controllers/moderation/users_controller.rb
View File

@@ -21,7 +21,7 @@ class Moderation::UsersController < Moderation::BaseController
private
def load_users
@users = User.with_hidden.search(params[:name_or_email]).page(params[:page]).for_render
@users = User.with_hidden.search(params[:search]).page(params[:page]).for_render
end
def block_user

2
app/views/admin/organizations/index.html.erb
View File

@@ -3,7 +3,7 @@
<div class="small-12 medium-6">
<%= form_for(Organization.new, url: search_admin_organizations_path, method: :get) do |f| %>
<div class="input-group">
<%= text_field_tag :term, "", placeholder: t("admin.organizations.index.search_placeholder") %>
<%= text_field_tag :search, "", placeholder: t("admin.organizations.index.search_placeholder") %>
<div class="input-group-button">
<%= f.submit t("admin.organizations.index.search"), class: "button" %>

2
app/views/admin/organizations/search.html.erb
View File

@@ -3,7 +3,7 @@
<div class="small-12 medium-6">
<%= form_for(Organization.new, url: search_admin_organizations_path, method: :get) do |f| %>
<div class="input-group">
<%= text_field_tag :term, "", placeholder: t("admin.organizations.index.search_placeholder") %>
<%= text_field_tag :search, "", placeholder: t("admin.organizations.index.search_placeholder") %>
<div class="input-group-button">
<%= f.submit t("admin.organizations.index.search"), class: "button" %>
</div>

2
app/views/admin/poll/officers/_search.html.erb
View File

@@ -2,7 +2,7 @@
<%= form_tag search_admin_officers_path, method: :get, remote: true do %>
<div class="input-group">
<%= text_field_tag :email, "",
<%= text_field_tag :search, "",
placeholder: t("admin.poll_officers.search.email_placeholder") %>
<div class="input-group-button">
<%= submit_tag t("admin.poll_officers.search.search"), class: "button" %>

2
app/views/moderation/users/index.html.erb
View File

@@ -3,7 +3,7 @@
<%= form_for(User.new, url: moderation_users_path, as: :user, method: :get) do |f| %>
<div class="row">
<div class="small-12 medium-6 column">
<%= text_field_tag :name_or_email, "", placeholder: t("moderation.users.index.search_placeholder") %>
<%= text_field_tag :search, "", placeholder: t("moderation.users.index.search_placeholder") %>
</div>
<div class="small-12 medium-6 column">
<%= f.submit t("moderation.users.index.search"), class: "button success" %>