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

small fixes

This commit is contained in:
Josh 2017-06-14 14:04:16 -04:00
parent 8a613c8a00
commit fce383d858
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
app/assets/javascripts/active_meetings.js
View File

@ -45,7 +45,8 @@ updateMeetingText = function(meeting){
}
initialPopulate = function(){
if (window.location.href.includes('preferences')) { return; }
// Only populate on room resources.
if (!window.location.href.includes('rooms')) { return; }
$.get((window.location.href + '/request').replace('#', ''), function(data){
meetings = data['meetings']
for(var i = 0; i < meetings.length; i++){

2
app/views/layouts/application.html.erb
View File

@ -67,7 +67,7 @@ with BigBlueButton; if not, see <http://www.gnu.org/licenses/>.
<div class='header'>
<span class="logo-wrapper pull-left">
<% if current_user %>
<%= link_to image_tag("bbb-logo.png", :alt => "BigBlueButton", :class => "logo"), meeting_room_path('rooms', User.find(current_user).encrypted_id) %>
<%= link_to image_tag("bbb-logo.png", :alt => "BigBlueButton", :class => "logo"), meeting_room_path('rooms', User.find(current_user.id).encrypted_id) %>
<% else %>
<%= link_to image_tag("bbb-logo.png", :alt => "BigBlueButton", :class => "logo"), root_path %>
<% end %>