Redstoner/redstoner.com
Archived
0
Fork 0
Code Issues Pull Requests 2 Wiki Activity

ordered searching to match SQL clauses, moved role&badge filtering to User.search

Browse Source
This commit is contained in:
MrYummy
2017-06-02 19:14:28 +02:00
parent 0d5d69ac6e
commit 887263d28e
5 changed files with 56 additions and 91 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
app/controllers/forumthreads_controller.rb
View File

@@ -3,16 +3,15 @@ class ForumthreadsController < ApplicationController
before_filter :check_permission, only: [:show, :edit, :update, :destroy]
def index
if params[:label] && !Label.where("lower(name) = ?", params[:label].downcase).try(:first) && params[:label].downcase != "no label"
flash[:alert] = "'#{params[:label]}' is not a valid label."
redirect_to forumthreads_path(params.except(:label, :controller, :action))
return
end
@threads = Forumthread.filter(current_user, params[:title], params[:content], params[:reply], params[:label], User.where("lower(ign) = ?", params[:author].to_s.downcase).try(:first), params[:query], Forum.where(id: params[:id]).try(:first))
params[:id] = nil if params[:id] && !Forum.find_by(id: params[:id])
params.each {|k,v| params[k] = nil if v==""}
@threads = Forumthread.filter(current_user, params[:title], params[:content], params[:reply], params[:label], User.find_by(ign: params[:author].to_s.strip) || params[:author], params[:query], Forum.find_by(id: params[:id]))
.page(params[:page]).per(30)
end
def show
if params[:reverse]
if params[:reverse] == "true"
@replies = @thread.replies.reverse_order.page(params[:page])
else
@replies = @thread.replies.page(params[:page])
@@ -88,17 +87,6 @@ class ForumthreadsController < ApplicationController
def search
end
def search_redirect
params.each do |key, value|
params[key] = nil if params[key] == ""
end
params[:id] = nil if params[:id] == "Search All Threads"
params[:label] = nil if params[:label] && params[:label].downcase == "label"
params[:author] = params[:author].tr("@ ", "") if params[:author]
params_list = Hash[params.except(:commit, :utf8, :authenticity_token)]
redirect_to forumthreads_path(params_list)
end
private
def check_permission

38
app/controllers/users_controller.rb
View File

@@ -4,33 +4,13 @@ class UsersController < ApplicationController
include MailerHelper
include ERB::Util
before_filter :set_user, except: [:index, :new, :create, :lost_password, :reset_password, :suggestions, :search_redirect]
before_filter :set_user, except: [:index, :new, :create, :lost_password, :reset_password, :suggestions]
def index
if params[:role]
if params[:role].downcase == "staff"
@users = User.joins(:role).where("roles.value >= ?", Role.get(:mod).to_i)
else
if role = Role.get(params[:role])
@users = User.joins(:role).where(role: role)
elsif params[:search] == nil
flash[:alert] = "role '#{params[:role]}' does not exist!"
redirect_to users_path
return
end
end
elsif params[:badge]
if badge = Badge.get(params[:badge])
@users = User.joins(:badge).where(badge: badge)
else
flash[:alert] = "badge '#{params[:badge]}' does not exist!"
redirect_to users_path
return
end
else
@users = User.joins(:role).where.not(id: User.first.id) #Remove first user
end
@users = User.search(@users, params[:search]) if params[:search]
params[:role] = nil if !Role.find_by(name: params[:role])
params[:badge] = nil if !Badge.find_by(name: params[:badge])
@users = User.search(params[:search], params[:role], params[:badge])
@users = @users.order("roles.value desc", "confirmed desc", :name) unless params[:badge]
@count = @users.size
@users = @users.page(params[:page]).per(100)
@@ -340,14 +320,6 @@ class UsersController < ApplicationController
end
end
def search_redirect
params.each do |key, value|
params[key] = nil if params[key] == ""
end
params_list = Hash[params.except(:commit, :utf8, :authenticity_token)]
redirect_to users_path(params_list)
end
private
def validate_token(uuid, email, token)