lino.jorzick/greenlight
1
0
Fork 0
forked from External/greenlight
Code Issues Pull Requests Projects Releases Wiki Activity

master #1

Merged
lino.jorzick merged 203 commits from External/greenlight:master into master 2021-10-02 18:19:43 +00:00
Conversation 0 Commits 203 Files Changed 134 +2 -2
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 3cec43edc3 - Show all commits

2
app/helpers/application_helper.rb
View File

@ -142,7 +142,7 @@ module ApplicationHelper
def perm_to_record_meeting def perm_to_record_meeting
if recording_consent_required? if recording_consent_required?
@settings.get_value("Room Configuration Recording") != "disabled" && @settings.get_value("Room Configuration Recording") != "disabled" &&
current_user&.role&.get_permission("can_launch_recording") current_user&.role&.get_permission("can_launch_recording")
else else
current_user&.role&.get_permission("can_launch_recording") current_user&.role&.get_permission("can_launch_recording")
end end

2
app/models/user.rb
View File

@ -159,7 +159,7 @@ class User < ApplicationRecord
def name_chunk def name_chunk
charset = ("a".."z").to_a - %w(b i l o s) + ("2".."9").to_a - %w(5 8) 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? if chunk.empty?
chunk + (0...3).map { charset.to_a[rand(charset.size)] }.join chunk + (0...3).map { charset.to_a[rand(charset.size)] }.join
elsif chunk.length == 1 elsif chunk.length == 1