From fce383d858b4d5b815d060e0425fcb27999f4cb4 Mon Sep 17 00:00:00 2001
From: Josh <josha5@outlook.com>
Date: Wed, 14 Jun 2017 14:04:16 -0400
Subject: [PATCH] small fixes

---
 app/assets/javascripts/active_meetings.js | 3 ++-
 app/views/layouts/application.html.erb    | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/app/assets/javascripts/active_meetings.js b/app/assets/javascripts/active_meetings.js
index 6f337058..8117dd39 100644
--- a/app/assets/javascripts/active_meetings.js
+++ b/app/assets/javascripts/active_meetings.js
@@ -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++){
diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb
index 3dd492f3..46065148 100644
--- a/app/views/layouts/application.html.erb
+++ b/app/views/layouts/application.html.erb
@@ -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 %>