From 9a3f21461a2215c798058e1f2671c0694585237a Mon Sep 17 00:00:00 2001
From: virusdefender <virusdefender@outlook.com>
Date: Tue, 19 Dec 2017 22:15:38 +0800
Subject: [PATCH 1/3] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E6=9F=90=E4=BA=9B?=
 =?UTF-8?q?=E6=83=85=E5=86=B5=E4=B8=8B=E6=B3=84=E9=9C=B2template=E7=9A=84?=
 =?UTF-8?q?=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 problem/serializers.py | 16 +++++++++-------
 1 file changed, 9 insertions(+), 7 deletions(-)

diff --git a/problem/serializers.py b/problem/serializers.py
index ded8f0f..051b710 100644
--- a/problem/serializers.py
+++ b/problem/serializers.py
@@ -90,6 +90,12 @@ class BaseProblemSerializer(serializers.ModelSerializer):
     tags = serializers.SlugRelatedField(many=True, slug_field="name", read_only=True)
     created_by = UsernameSerializer()
 
+    def get_public_template(self, obj):
+        ret = {}
+        for lang, code in obj.template.items():
+            ret[lang] = parse_problem_template(code)["template"]
+        return ret
+
 
 class ProblemAdminSerializer(BaseProblemSerializer):
     class Meta:
@@ -98,13 +104,7 @@ class ProblemAdminSerializer(BaseProblemSerializer):
 
 
 class ProblemSerializer(BaseProblemSerializer):
-    template = serializers.SerializerMethodField()
-
-    def get_template(self, obj):
-        ret = {}
-        for lang, code in obj.template.items():
-            ret[lang] = parse_problem_template(code)["template"]
-        return ret
+    template = serializers.SerializerMethodField("get_public_template")
 
     class Meta:
         model = Problem
@@ -113,6 +113,8 @@ class ProblemSerializer(BaseProblemSerializer):
 
 
 class ProblemSafeSerializer(BaseProblemSerializer):
+    template = serializers.SerializerMethodField("get_public_template")
+
     class Meta:
         model = Problem
         exclude = ("test_case_score", "test_case_id", "visible", "is_public",

From eeadb5b87b44cbf8ef14af6a22d87f3dd1a9be9c Mon Sep 17 00:00:00 2001
From: virusdefender <virusdefender@outlook.com>
Date: Tue, 19 Dec 2017 22:25:10 +0800
Subject: [PATCH 2/3] fix docker exec error

---
 deploy/run.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/deploy/run.sh b/deploy/run.sh
index 271e2fc..e41556f 100755
--- a/deploy/run.sh
+++ b/deploy/run.sh
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/bin/sh
 
 APP=/app
 DATA=/data

From 63818dc766409f317507715fe6a1595af9b4e854 Mon Sep 17 00:00:00 2001
From: virusdefender <virusdefender@outlook.com>
Date: Tue, 19 Dec 2017 22:25:50 +0800
Subject: [PATCH 3/3] ignore nginx conf links

---
 .gitignore | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/.gitignore b/.gitignore
index dd8c244..d142bf2 100644
--- a/.gitignore
+++ b/.gitignore
@@ -71,3 +71,6 @@ data/public/upload/*
 data/public/avatar/*
 !data/public/avatar/default.png
 
+http_locations.conf
+https_locations.conf
+