From 3cec43edc388ce3298f96140e017c4ec948833d9 Mon Sep 17 00:00:00 2001 From: Ahmad Farhat Date: Mon, 28 Jun 2021 22:47:34 -0400 Subject: [PATCH] Prevent double hyphens in room names (#2813) --- app/helpers/application_helper.rb | 2 +- app/models/user.rb | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb index 2c3121e9..6e752d0b 100644 --- a/app/helpers/application_helper.rb +++ b/app/helpers/application_helper.rb @@ -142,7 +142,7 @@ module ApplicationHelper def perm_to_record_meeting if recording_consent_required? @settings.get_value("Room Configuration Recording") != "disabled" && - current_user&.role&.get_permission("can_launch_recording") + current_user&.role&.get_permission("can_launch_recording") else current_user&.role&.get_permission("can_launch_recording") end diff --git a/app/models/user.rb b/app/models/user.rb index a8a18bbe..5c6e32c5 100644 --- a/app/models/user.rb +++ b/app/models/user.rb @@ -159,7 +159,7 @@ class User < ApplicationRecord def name_chunk charset = ("a".."z").to_a - %w(b i l o s) + ("2".."9").to_a - %w(5 8) - chunk = name.parameterize[0...3] + chunk = name.parameterize(separator: "")[0...3] if chunk.empty? chunk + (0...3).map { charset.to_a[rand(charset.size)] }.join elsif chunk.length == 1