merenber
/
greenlight
Archived
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fixed #366: Changed how GreenLight handles LDAP jpegPhoto (GRN-92) (#445) 

* Fixed issue with LDAP jpegPhoto

* Update _header.html.erb
This commit is contained in:
farhatahmad 2019-04-11 11:53:32 -04:00 committed by Jesus Federico
parent 822dd27509
commit d39a11059e
4 changed files with 31 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
app/assets/javascripts/header.js Normal file
View File

@ -0,0 +1,28 @@
// BigBlueButton open source conferencing system - http://www.bigbluebutton.org/.
//
// Copyright (c) 2018 BigBlueButton Inc. and by respective authors (see below).
//
// This program is free software; you can redistribute it and/or modify it under the
// terms of the GNU Lesser General Public License as published by the Free Software
// Foundation; either version 3.0 of the License, or (at your option) any later
// version.
//
// BigBlueButton is distributed in the hope that it will be useful, but WITHOUT ANY
// WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
// PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details.
//
// You should have received a copy of the GNU Lesser General Public License along
// with BigBlueButton; if not, see <http://www.gnu.org/licenses/>.
$(document).on('turbolinks:load', function(){
// Checks to see if the user provided an image url and displays it if they did
$("#user-image")
.on("load", function() {
$("#user-image").show()
$("#user-avatar").hide()
})
.on("error", function() {
$("#user-image").hide()
$("#user-avatar").show()
})
})

1
app/models/user.rb
View File

@ -33,7 +33,6 @@ class User < ApplicationRecord
validates :name, length: { maximum: 256 }, presence: true
validates :provider, presence: true
validates :image, format: { with: /\.(png|jpg)\Z/i }, allow_blank: true
validates :email, length: { maximum: 256 }, allow_blank: true,
uniqueness: { case_sensitive: false, scope: :provider },
format: { with: /\A[\w+\-.]+@[a-z\d\-.]+\.[a-z]+\z/i }

3
app/views/shared/_header.html.erb
View File

@ -30,7 +30,8 @@
<% if current_user.image.blank? %>
<span class="avatar"><%= current_user.name.first %></span>
<% else %>
<span class="avatar" style="background-image: url(<%= current_user.image %>)"></span>
<span id="user-avatar" class="avatar d-none"><%= current_user.name.first %></span>
<%= image_tag(current_user.image, id: "user-image", class: "avatar") %>
<% end %>
<span class="ml-2 d-none d-lg-block">
<span class="text-default username"><%= current_user.name %></span>

2
spec/models/user_spec.rb
View File

@ -40,7 +40,7 @@ describe User, type: :model do
it { should allow_value("valid.jpg").for(:image) }
it { should allow_value("valid.png").for(:image) }
it { should_not allow_value("invalid.txt").for(:image) }
it { should allow_value("random_file.txt").for(:image) }
it { should allow_value("", nil).for(:image) }
it "should convert email to downcase on save" do