Merge branch 'master' of github.com:blindsidenetworks/greenlight

2016-10-20 09:53:35 -04:00
parent 5fecb98d0b 201a3ca0f5
commit 45856384d9
8 changed files with 26 additions and 10 deletions
--- a/app/views/landing/meeting.html.erb
+++ b/app/views/landing/meeting.html.erb
@ -7,7 +7,11 @@
        <% if !current_user.nil? %>
          <span class="user">Hello <%= current_user.name %></span>
          <%= link_to "Logout", user_logout_url() %>
-          <div><%= link_to 'Personal Room', current_user.room_url %></div>
+          <% if current_user.username %>
+            <div><%= link_to 'Personal Room', current_user.room_url %></div>
+          <% else %>
+            <div><%= link_to 'Set Username', edit_user_path(current_user) %></div>
+          <% end %>
        <% end %>
      </div>
    </div>