From 3f570f0b336958dfcf9c95d2d39e3a4339f78790 Mon Sep 17 00:00:00 2001
From: esp <sxwxs@msn.com>
Date: Sun, 6 Sep 2015 14:55:56 +0800
Subject: [PATCH 1/3] =?UTF-8?q?update=20utils.py=20=E6=B7=BB=E5=8A=A0?=
 =?UTF-8?q?=E4=BA=86=E6=8A=8A=E6=AF=94=E8=B5=9B=E9=A2=98=E7=9B=AE=E6=B7=BB?=
 =?UTF-8?q?=E5=8A=A0=E5=88=B0=E5=89=8D=E5=8F=B0=E9=A2=98=E7=9B=AE=E5=88=97?=
 =?UTF-8?q?=E8=A1=A8=E7=9A=84=E8=84=9A=E6=9C=AC=E5=B7=A5=E5=85=B7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Accessories/utils.py | 38 +++++++++++++++++++++++++++++++++++++-
 1 file changed, 37 insertions(+), 1 deletion(-)

diff --git a/Accessories/utils.py b/Accessories/utils.py
index 264bd55..36551bb 100644
--- a/Accessories/utils.py
+++ b/Accessories/utils.py
@@ -1,6 +1,6 @@
 import django
 from contest.models import *
-
+from problem.models import *
 django.setup()
 
 
@@ -27,3 +27,39 @@ def add_exist_problem_to_contest(problems, contest_id):
                               memory_limit=problem.memory_limit)
         i += 1
     return
+
+def add_contest_problem_to_problem(contest_id):
+    try:
+        contest = Contest.objects.get(pk=contest_id)
+    except Contest.DoesNotExist:
+        print "Contest Doesn't Exist!"
+        return
+    #Get all problems in this contest
+    problems = ContestProblem.objects.filter(contest=contest)
+    
+    #get a tag
+    try:
+        tag = ProblemTag.objects.get(name=contest.title)
+    except ProblemTag.DoesNotExist:
+        tag = ProblemTag.objects.create(name=tag)
+        
+    #for each problem
+    for problem in problems:
+        print "Add problem to problem list:"
+        print problem.title
+        p = Problem(title=problem.title, 
+                              description=problem.description,
+                              input_description=problem.input_description,
+                              output_description=problem.output_description,
+                              samples=problem.samples,
+                              test_case_id=problem.test_case_id,
+                              hint=problem.hint,
+                              created_by=problem.created_by,
+                              time_limit=problem.time_limit,
+                              memory_limit=problem.memory_limit,
+                              visible = False,
+                              difficulty = 0,
+                              source = contest.title)
+        p.tags.add(tag)
+        p.save()
+    return
\ No newline at end of file

From 8f39e33d279b59bd1f880dad20ff7a8378d801b9 Mon Sep 17 00:00:00 2001
From: esp <sxwxs@msn.com>
Date: Sun, 6 Sep 2015 15:21:59 +0800
Subject: [PATCH 2/3] =?UTF-8?q?update=20utils.py=20=E4=BF=AE=E5=A4=8D?=
 =?UTF-8?q?=E5=88=9A=E6=89=8D=E6=8F=90=E4=BA=A4=E7=9A=84bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Accessories/utils.py | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/Accessories/utils.py b/Accessories/utils.py
index 36551bb..e67f550 100644
--- a/Accessories/utils.py
+++ b/Accessories/utils.py
@@ -41,13 +41,13 @@ def add_contest_problem_to_problem(contest_id):
     try:
         tag = ProblemTag.objects.get(name=contest.title)
     except ProblemTag.DoesNotExist:
-        tag = ProblemTag.objects.create(name=tag)
+        tag = ProblemTag.objects.create(name=contest.title)
         
     #for each problem
     for problem in problems:
         print "Add problem to problem list:"
         print problem.title
-        p = Problem(title=problem.title, 
+        p = Problem.objects.create(title=problem.title, 
                               description=problem.description,
                               input_description=problem.input_description,
                               output_description=problem.output_description,
@@ -61,5 +61,4 @@ def add_contest_problem_to_problem(contest_id):
                               difficulty = 0,
                               source = contest.title)
         p.tags.add(tag)
-        p.save()
     return
\ No newline at end of file

From 6dc0c43dccb506a7537273f2f29e31840bab1e8f Mon Sep 17 00:00:00 2001
From: esp <sxwxs@msn.com>
Date: Sun, 6 Sep 2015 15:34:07 +0800
Subject: [PATCH 3/3] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=B0=8F=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98=EF=BC=8C=E6=8C=89=E7=85=A7=E6=A0=87=E7=AD=BE=E7=AD=9B?=
 =?UTF-8?q?=E9=80=89=E5=B0=86=E4=BC=9A=E6=98=BE=E7=A4=BA=E9=9A=90=E8=97=8F?=
 =?UTF-8?q?=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 problem/views.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/problem/views.py b/problem/views.py
index b73085f..9f65932 100644
--- a/problem/views.py
+++ b/problem/views.py
@@ -235,7 +235,7 @@ def problem_list_page(request, page=1):
             tag = ProblemTag.objects.get(name=tag_text)
         except ProblemTag.DoesNotExist:
             return error_page(request, u"标签不存在")
-        problems = tag.problem_set.all()
+        problems = tag.problem_set.all().filter(visible=True)
 
     paginator = Paginator(problems, 20)
     try: