Merge branch 'mr/beta/dbmw' into 'master'

grey

See merge request !43

qa/models/answer.py

@@ -1096,7 +1096,7 @@ class Answer(models.Model):
             delta_30 = datetime.timedelta(days=30)
             delta_90 = datetime.timedelta(days=90)
             delta_365 = datetime.timedelta(days=365)
-            if d2:
+            if d2 and create_time and (delta_30 or delta_90 or delta_365):
                 if d2 - delta_30 <= create_time:
                     return 30
                 elif d2 - delta_90 <= create_time:

talos/models/tractate/tractate.py

@@ -205,6 +205,7 @@ class Tractate(models.Model):
             delta_30 = datetime.timedelta(days=30)
             delta_90 = datetime.timedelta(days=90)
             delta_365 = datetime.timedelta(days=365)
+            if d2 and create_time and (delta_30 or delta_90 or delta_365):
                 if d2 - delta_30 <= create_time:
                     return 30
                 elif d2 - delta_90 <= create_time:
@@ -213,6 +214,8 @@ class Tractate(models.Model):
                     return 365
                 else:
                     return 1000
+            else:
+                return 1000
         except:
             logging.error("catch exception,err_msg:%s" % traceback.format_exc())
             return 1000