Merge ff16668941 into 137d997793

app/controllers/admin/questions_controller.rb

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

app/controllers/admin/versions_controller.rb

@@ -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)

app/controllers/admin/volunteers_controller.rb

@@ -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

app/controllers/api/v1/speakers_controller.rb

@@ -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

app/controllers/booths_controller.rb

@@ -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

app/helpers/users_helper.rb

@@ -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

app/models/program.rb

@@ -231,7 +231,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

app/views/schedules/show.xml.haml

@@ -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