assigned a user id, does not "appear" to have screwed anything up

This commit is contained in:
Ken Johnson
2013-05-24 15:25:06 -04:00
parent 383835d57d
commit 0d841124f5
13 changed files with 31 additions and 17 deletions
+1 -1
View File
@@ -11,7 +11,7 @@
<span class="caret"></span>
<ul class="dropdown-menu pull-right">
<li>
<%= link_to "account settings", user_account_settings_path(:user_id => current_user.id) %>
<%= link_to "account settings", user_account_settings_path(:user_id => current_user.user_id) %>
</li>
<li>
<%= link_to "logout", logout_path %>
+1 -1
View File
@@ -10,7 +10,7 @@
</li>
<% if is_admin? %>
<li id='admin'>
<%= link_to admin_dashboard_path(:admin_id => current_user.id) do %>
<%= link_to admin_dashboard_path(:admin_id => current_user.user_id) do %>
<div class="icon">
<span class="fs1" aria-hidden="true" data-icon="&#xe1c8;"></span>
</div>