From be7fb2cdf005ed3d5c34d0ca4057fed1436fa3be Mon Sep 17 00:00:00 2001 From: Ben Halpern Date: Wed, 30 Jan 2019 16:01:23 -0500 Subject: [PATCH] Fix linting (#1694) --- app/controllers/internal/users_controller.rb | 15 +++++++-- app/views/internal/users/index.html.erb | 32 ++++++++++++-------- 2 files changed, 31 insertions(+), 16 deletions(-) diff --git a/app/controllers/internal/users_controller.rb b/app/controllers/internal/users_controller.rb index 605cde6c9..c738319f0 100644 --- a/app/controllers/internal/users_controller.rb +++ b/app/controllers/internal/users_controller.rb @@ -4,12 +4,21 @@ class Internal::UsersController < Internal::ApplicationController def index @users = case params[:state] when "mentors" - User.where(offering_mentorship: true).page(params[:page]).per(20) + User.where(offering_mentorship: true).page(params[:page]).per(50) when "mentees" - User.where(seeking_mentorship: true).page(params[:page]).per(20) + User.where(seeking_mentorship: true).page(params[:page]).per(50) + when /role\-/ + User.with_role(params[:state].split("-")[1], :any).page(params[:page]).per(50) else - User.order("created_at DESC").page(params[:page]).per(20) + User.order("created_at DESC").page(params[:page]).per(50) end + if params[:search].present? + @users = @users.where('users.name ILIKE :search OR + users.username ILIKE :search OR + users.github_username ILIKE :search OR + users.email ILIKE :search OR + users.twitter_username ILIKE :search', search: "%#{params[:search].strip}%") + end end def edit diff --git a/app/views/internal/users/index.html.erb b/app/views/internal/users/index.html.erb index ec81053fc..cd54c6a2f 100644 --- a/app/views/internal/users/index.html.erb +++ b/app/views/internal/users/index.html.erb @@ -3,23 +3,29 @@ border: 2px red solid; } -

- All Users || - Mentors Only || - Mentees Only +

+ ">All | + ">Mentors | + ">Mentees | + ">Admins | + ">Super Admins | + ">Trusted | + ">Tag Mods

-<% if params[:state] == "mentors" %> -

Mentors

-<% elsif params[:state] == "mentees" %> -

Mentees

-<% else %> -

All Users

+<%= form_tag("/internal/users", method: "get") do %> + <%= label_tag(:search, "Find by:") %> + <%= text_field_tag(:search, params[:search]) %> + <% if params[:state].present? %> + <%= hidden_field_tag(:state, params[:state]) %> + <% end %> + <%= submit_tag("Search") %> + (fields: name, username, twitter_username, github_username, email) <% end %> <%= paginate @users %> <% @users.each do |user| %>
-

<%= user.name%>

-

@<%= user.username%>

+

<%= user.name %>

+

@<%= user.username %>

<% end %> -<%= paginate @users %> \ No newline at end of file +<%= paginate @users %>