diff --git a/app/controllers/performance_controller.rb b/app/controllers/performance_controller.rb index 512e751..bdbff15 100644 --- a/app/controllers/performance_controller.rb +++ b/app/controllers/performance_controller.rb @@ -1,7 +1,7 @@ class PerformanceController < ApplicationController def index - @user = current_user + @perf = current_user.performance end end diff --git a/app/models/user.rb b/app/models/user.rb index 3061d2a..192eb32 100755 --- a/app/models/user.rb +++ b/app/models/user.rb @@ -13,7 +13,7 @@ class User < ActiveRecord::Base has_one :retirement, :foreign_key => :user_id, :primary_key => :user_id has_one :paid_time_off, :foreign_key => :user_id, :primary_key => :user_id has_one :work_info, :foreign_key => :user_id, :primary_key => :user_id - has_one :performance, :foreign_key => :user_id, :primary_key => :user_id + has_many :performance, :foreign_key => :user_id, :primary_key => :user_id diff --git a/app/views/layouts/shared/_sidebar.html.erb b/app/views/layouts/shared/_sidebar.html.erb index ae5162d..31e8137 100755 --- a/app/views/layouts/shared/_sidebar.html.erb +++ b/app/views/layouts/shared/_sidebar.html.erb @@ -21,7 +21,7 @@