Make behavior of to_navbar login the same as other dlss apps

sul-dlss · May 10, 2017 · e0428d6 · e0428d6
1 parent 9515edd
commit e0428d6
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/app/views/home/index.html.erb b/app/views/home/index.html.erb
@@ -58,7 +58,7 @@
     <% end %>
   <% end %>
   <% Settings.pl_sql_jobs.each_with_index do |(k,v),i| %>
-    <% if v.sunet_ids.include?(current_user.user_id) %>
+    <% if v.sunet_ids.include?(user_id) %>
     <p></p>
     <div class="panel panel-default">
       <div class="panel-heading" role="tab">

diff --git a/app/views/shared/_top_navbar.html.erb b/app/views/shared/_top_navbar.html.erb
@@ -8,9 +8,9 @@
 
     <div class="header-links" id="login_id" data="<%= user_id %>">
       <% if webauth_user? %>
-      <%= "Logged in as #{@current_user_name} (#{user_id})" %>
+        <%= link_to "#{user_id}: Logout", logout_path(referrer: root_path) %>
       <% else %>
-      <%= link_to "Login here", login_path(referrer: request.original_url) %>
+        rails_h<%= link_to "Login here", login_path(referrer: request.original_url) %>
       <% end %>
     </div>