From b34009a6b3b9dc2f327518c30f957bce1565d6a2 Mon Sep 17 00:00:00 2001 From: virusdefender <1670873886@qq.com> Date: Mon, 12 Oct 2015 12:53:16 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=B0=8F=20bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../0010_remove_user_login_failed_counter.py | 18 ++++++++++++++++++ template/src/oj/announcement/announcement.html | 5 ++--- 2 files changed, 20 insertions(+), 3 deletions(-) create mode 100644 account/migrations/0010_remove_user_login_failed_counter.py diff --git a/account/migrations/0010_remove_user_login_failed_counter.py b/account/migrations/0010_remove_user_login_failed_counter.py new file mode 100644 index 0000000..61e09f1 --- /dev/null +++ b/account/migrations/0010_remove_user_login_failed_counter.py @@ -0,0 +1,18 @@ +# -*- coding: utf-8 -*- +from __future__ import unicode_literals + +from django.db import models, migrations + + +class Migration(migrations.Migration): + + dependencies = [ + ('account', '0009_user_reset_password_token_create_time'), + ] + + operations = [ + migrations.RemoveField( + model_name='user', + name='login_failed_counter', + ), + ] diff --git a/template/src/oj/announcement/announcement.html b/template/src/oj/announcement/announcement.html index 2ce84a1..8cbc239 100644 --- a/template/src/oj/announcement/announcement.html +++ b/template/src/oj/announcement/announcement.html @@ -10,11 +10,10 @@ 作者：{{ announcement.created_by }}     创建时间：{{ announcement.create_time }} - {% ifequal announcement.create_time announcement.last_update_time %} - {% else %} + {% ifnotequal announcement.create_time announcement.last_update_time %}     最后更新：{{ announcement.last_update_time }} - {% endifequal %} + {% endifnotequal %}