From 9cd52115fc79cdd7165d9aae635b08ff090ee153 Mon Sep 17 00:00:00 2001
From: uzi <uzi@localhost.localdomain>
Date: Tue, 24 Nov 2015 20:11:25 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E7=94=A8=E6=88=B7=E6=B3=A8?=
 =?UTF-8?q?=E5=86=8C=E5=AD=97=E6=AE=B5=EF=BC=8C=E5=AD=A6=E6=A0=A1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 account/serializers.py                   | 1 +
 account/views.py                         | 2 +-
 static/src/js/app/oj/account/register.js | 3 ++-
 template/src/oj/account/register.html    | 5 +++++
 4 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/account/serializers.py b/account/serializers.py
index 7bffe63..6db6291 100644
--- a/account/serializers.py
+++ b/account/serializers.py
@@ -21,6 +21,7 @@ class EmailCheckSerializer(serializers.Serializer):
 class UserRegisterSerializer(serializers.Serializer):
     username = serializers.CharField(max_length=30)
     real_name = serializers.CharField(max_length=30)
+    school = serializers.CharField(max_length=200)
     password = serializers.CharField(max_length=30, min_length=6)
     email = serializers.EmailField(max_length=254)
     captcha = serializers.CharField(max_length=4, min_length=4)
diff --git a/account/views.py b/account/views.py
index b7a8478..ac8ebdf 100644
--- a/account/views.py
+++ b/account/views.py
@@ -98,7 +98,7 @@ class UserRegisterAPIView(APIView):
                                            email=data["email"])
                 user.set_password(data["password"])
                 user.save()
-                UserProfile.objects.create(user=user)
+                UserProfile.objects.create(user=user, school=data["school"])
                 return success_response(u"注册成功！")
         else:
             return serializer_invalid_response(serializer)
diff --git a/static/src/js/app/oj/account/register.js b/static/src/js/app/oj/account/register.js
index 46402b1..ef23a38 100644
--- a/static/src/js/app/oj/account/register.js
+++ b/static/src/js/app/oj/account/register.js
@@ -3,13 +3,14 @@ require(["jquery", "bsAlert", "csrfToken", "validator"], function ($, bsAlert, c
         if (!e.isDefaultPrevented()) {
             var username = $("#username").val();
             var realName = $("#real_name").val();
+            var school = $('#school').val();
             var password = $("#password").val();
             var email = $("#email").val();
             var captcha = $("#captcha").val();
             $.ajax({
                 beforeSend: csrfTokenHeader,
                 url: "/api/register/",
-                data: {username: username, real_name: realName, password: password, email: email, captcha:captcha},
+                data: {username: username, school: school, real_name: realName, password: password, email: email, captcha:captcha},
                 dataType: "json",
                 method: "post",
                 success: function (data) {
diff --git a/template/src/oj/account/register.html b/template/src/oj/account/register.html
index a5e95e9..f3b990b 100644
--- a/template/src/oj/account/register.html
+++ b/template/src/oj/account/register.html
@@ -18,6 +18,11 @@
                     <input type="text" class="form-control input-lg" id="real_name" name="real_name" placeholder="真实姓名" data-error="请填写姓名" required>
                     <div class="help-block with-errors"></div>
                 </div>
+                <div class="form-group">
+                    <label for="real_name">学校</label>
+                    <input type="text" class="form-control input-lg" id="school" name="school" placeholder="学校" data-error="请填写学校" required>
+                    <div class="help-block with-errors"></div>
+                </div>
                 <div class="form-group">
                     <label for="email">邮箱地址</label>
                     <input type="email" class="form-control input-lg" id="email" name="email" placeholder="邮箱地址" data-remote="/api/email_check/" data-remote-error="该邮箱已被注册！" data-error="请填写正确的邮箱地址" required>