|
@@ -17,7 +17,7 @@ class PeopleController < ApplicationController
|
|
|
end
|
|
|
|
|
|
def notset
|
|
|
- @people = Person.left_outer_joins(:passes).distinct.where('`passes`.`person_id` IS NULL')
|
|
|
+ @people = Person.eager_load(:passes).distinct.where('`passes`.`person_id` IS NULL')
|
|
|
|
|
|
self.commonindex
|
|
|
end
|
|
@@ -31,7 +31,7 @@ class PeopleController < ApplicationController
|
|
|
if params[:q].nil? or params[:q] == ""
|
|
|
@people = Person.preload(:passes).all
|
|
|
else
|
|
|
- @people = Person.preload(:passes).where("fullname LIKE :q", "%#{params[:q]}%")
|
|
|
+ @people = Person.preload(:passes).where("fullname LIKE :q", { :q => "%#{params[:q]}%" })
|
|
|
end
|
|
|
|
|
|
self.commonindex
|
|
@@ -64,8 +64,8 @@ class PeopleController < ApplicationController
|
|
|
hash = @person.as_json
|
|
|
|
|
|
if @person.IsManual?
|
|
|
- patronymic = @person.Patronymic
|
|
|
- patronymic = @person.Patronymic.gsub('Ё', 'Е').gsub('ё', 'е') unless patronymic.nil?
|
|
|
+ #patronymic = @person.Patronymic
|
|
|
+ #patronymic = @person.Patronymic.gsub('Ё', 'Е').gsub('ё', 'е') unless patronymic.nil?
|
|
|
#@availablePasses = Pass.where(:lastname => @person.Lastname.gsub('Ё', 'Е').gsub('ё', 'е'), :firstname => @person.Firstname.gsub('Ё', 'Е').gsub('ё', 'е'), :patronymic => patronymic)
|
|
|
##@availablePasses = Pass.where(:lastname => @person.Lastname.gsub('Ё', 'Е').gsub('ё', 'е'), :firstname => @person.Firstname.gsub('Ё', 'Е').gsub('ё', 'е')) if @availablePasses.nil? or @availablePasses.size == 0
|
|
|
#@availablePasses = Pass.find_by_sql('SELECT `passes`.* FROM `passes` LEFT JOIN `people` ON `passes`.`person_id` = `people`.`id` WHERE `people`.`id` IS NULL') if @availablePasses.nil? or @availablePasses.size == 0
|