team-alpha/railsgoat
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

removes user_id column from User model to use idiomatic Rails automatic IDs

Browse Source
This commit is contained in:
Joseph Mastey
2017-10-07 09:34:26 -06:00
parent c4f0b91534
commit b6c2259b88
29 changed files with 421 additions and 430 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/views/layouts/shared/_header.html.erb
+1 -1
View File
@@ -14,7 +14,7 @@
<span class="caret"></span>
<ul class="dropdown-menu pull-right">
<li>
<%= link_to "Account settings", user_account_settings_path(:user_id => current_user.user_id) %>
<%= link_to "Account settings", user_account_settings_path(user_id: current_user.id) %>
</li>
<li>
<%= link_to "Logout", logout_path %>
app/views/layouts/shared/_sidebar.html.erb
+8 -8
View File
@@ -32,7 +32,7 @@
</li>
<% end %>
<li id="benefit_forms">
<%= link_to user_benefit_forms_path(:user_id => current_user.user_id) do %>
<%= link_to user_benefit_forms_path(user_id: current_user.id) do %>
<div class="icon">
<span class="fs1" aria-hidden="true" data-icon="&#xe05c;"></span>
</div>
@@ -40,7 +40,7 @@
<% end %>
</li>
<li id="retirement">
<%= link_to user_retirement_index_path(:user_id => current_user.user_id) do %>
<%= link_to user_retirement_index_path(user_id: current_user.id) do %>
<div class="icon">
<span class="fs1" aria-hidden="true" data-icon="&#xe096;"></span>
</div>
@@ -48,7 +48,7 @@
<% end %>
</li>
<li id="pto">
<%= link_to user_paid_time_off_index_path(:user_id => current_user.user_id) do %>
<%= link_to user_paid_time_off_index_path(user_id: current_user.id) do %>
<div class="icon">
<span class="fs1" aria-hidden="true" data-icon="&#xe0d2;"></span>
</div>
@@ -56,7 +56,7 @@
<% end %>
</li>
<li id="employee_info">
<%= link_to user_work_info_index_path(:user_id => current_user.user_id) do %>
<%= link_to user_work_info_index_path(user_id: current_user.id) do %>
<div class="icon">
<span class="fs1" aria-hidden="true" data-icon="&#xe0a9;"></span>
</div>
@@ -64,7 +64,7 @@
<% end %>
</li>
<li id="performance">
<%= link_to user_performance_index_path(:user_id => current_user.user_id) do %>
<%= link_to user_performance_index_path(user_id: current_user.id) do %>
<div class="icon">
<span class="fs1" aria-hidden="true" data-icon="&#xe14a;"></span>
</div>
@@ -72,7 +72,7 @@
<% end %>
</li>
<li id="messages">
<%= link_to user_messages_path(:user_id => current_user.user_id) do %>
<%= link_to user_messages_path(user_id: current_user.id) do %>
<div class="icon">
<span class="fs1" aria-hidden="true" data-icon="&#xe040;"></span>
</div>
@@ -80,7 +80,7 @@
<% end %>
</li>
<li id="pay">
<%= link_to user_pay_index_path(:user_id => current_user.user_id) do %>
<%= link_to user_pay_index_path(user_id: current_user.id) do %>
<div class="icon">
<span class="fs1" aria-hidden="true" data-icon="&#xe038;"></span>
</div>
@@ -139,4 +139,4 @@
});
</script>
<% end %>
<% end %>