change uniq to distinct for SQL queries to fix deprecation

This commit is contained in:
sspsk 2017-12-16 15:39:43 +02:00
parent 2180e6197c
commit ba9d19c832
9 changed files with 9 additions and 9 deletions

View file

@ -11,7 +11,7 @@ module Admin
end
def show
@registrations = @conference.registrations.joins(:qanswers).uniq
@registrations = @conference.registrations.joins(:qanswers).distinct
end
def new

View file

@ -9,7 +9,7 @@ module Admin
if current_user.has_role? :organization_admin, :any
@conferences_with_role = Organization.with_role('organization_admin', current_user).map { |org| org.conferences.pluck :short_title }.flatten
end
@conferences_with_role.uniq!
@conferences_with_role.distinct!
return if @conference.blank?
@versions = PaperTrail::Version.where(conference_id: @conference.id).accessible_by(current_ability)

View file

@ -14,7 +14,7 @@ module Admin
def show
if can_manage_volunteers?(@conference)
@volunteers = if @conference.use_vpositions
@conference.registrations.joins(:vchoices).uniq
@conference.registrations.joins(:vchoices).distinct
else
@conference.registrations.where(volunteer: true)
end

View file

@ -15,7 +15,7 @@ module Api
users = User.joins(:event_users)
end
users = users.where(event_users: {event_role: :speaker}).uniq
users = users.where(event_users: {event_role: :speaker}).distinct
render json: users, each_serializer: SpeakerSerializer, callback: params['callback']
end
end

View file

@ -5,7 +5,7 @@ class BoothsController < ApplicationController
skip_authorize_resource only: [:withdraw, :confirm, :restart]
def index
@booths = current_user.booths.where(conference_id: @conference.id).uniq
@booths = current_user.booths.where(conference_id: @conference.id).distinct
end
def show; end

View file

@ -18,7 +18,7 @@ module UsersHelper
providers << provider if !ENV["OSEM_#{provider.upcase}_KEY"].blank? && !ENV["OSEM_#{provider.upcase}_SECRET"].blank?
end
providers.uniq
providers.distinct
end
# Receives a hash, generated from User model, function get_roles

View file

@ -103,7 +103,7 @@ class AdminAbility
def signed_in_with_organizer_role(user, conf_ids_for_organization_admin = [])
# ids of all the conferences for which the user has the 'organizer' role and
# conferences that belong to organizations for which user is 'organization_admin'
conf_ids = conf_ids_for_organization_admin.concat(Conference.with_role(:organizer, user).pluck(:id)).uniq
conf_ids = conf_ids_for_organization_admin.concat(Conference.with_role(:organizer, user).pluck(:id)).distinct
# ids of all the tracks that belong to the programs of the above conferences
track_ids = Track.joins(:program).where('programs.conference_id IN (?)', conf_ids).pluck(:id)

View file

@ -227,7 +227,7 @@ class Program < ApplicationRecord
languages.match(/^$|(\A[a-z][a-z](,[a-z][a-z])*\z)/).present?
languages_array = languages.split(',')
# We check that languages are not repeated
errors.add(:languages, "can't be repeated") && return unless languages_array.uniq!.nil?
errors.add(:languages, "can't be repeated") && return unless languages_array.distinct!.nil?
# We check if every language is a valid ISO 639-1 language
errors.add(:languages, 'must be ISO 639-1 valid codes') unless languages_array.select{ |x| ISO_639.find(x).nil? }.empty?
end

View file

@ -32,5 +32,5 @@
%license/
%optout=false #FIXME
%persons
- event.speakers.uniq.each do |speaker|
- event.speakers.distinct.each do |speaker|
%person{ id: speaker.id }= speaker.name