gunghogeoduck/osem-fcy
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

change uniq to distinct for SQL queries to fix deprecation

Browse source
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
Download patch file Download diff file Expand all files Collapse all files

2
app/models/admin_ability.rb
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)

2
app/models/program.rb
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