# HG changeset patch
# User Jittat Fakcharoenphol <jittat@gmail.com>
# Date 2010-01-30 04:22:31
# Node ID 0f32f3dd1054f8dec4c33c7f6ea2400a33a3cb18
# Parent  180b30450ef310c1931e4e6e05138c9d5a437871
# Parent  bdb708ab847bac5b9cab9daca3cd468641c4e2bd

Merge branch 'master' into codejom (user stat reset)

Conflicts:
	app/models/user.rb

diff --git a/app/controllers/contests_controller.rb b/app/controllers/contests_controller.rb
--- a/app/controllers/contests_controller.rb
+++ b/app/controllers/contests_controller.rb
@@ -17,6 +17,14 @@
     end
   end
 
+  def clear_stat
+    user = User.find(params[:id])
+    if user.contest_stat!=nil
+      user.contest_stat.destroy
+    end
+    redirect_to :action => 'user_stat'
+  end
+
   def clear_all_stat
     if not Configuration.indv_contest_mode?
       redirect_to :action => 'index' and return
diff --git a/app/models/user.rb b/app/models/user.rb
--- a/app/models/user.rb
+++ b/app/models/user.rb
@@ -20,7 +20,7 @@
   has_many :test_pair_assignments, :dependent => :delete_all
   has_many :submission_statuses
 
-  has_one :contest_stat, :class_name => "UserContestStat"
+  has_one :contest_stat, :class_name => "UserContestStat", :dependent => :destroy
 
   belongs_to :site
   belongs_to :country