Merge branch 'dev' into 'master'

modify

See merge request alpha/physical!60

search/views/topic.py

@@ -181,7 +181,7 @@ def query_topic_by_tag_aggregation(user_id,tag_id, offset, size):
             user_id = -1
         if not tag_id:
             tag_id = -1
-                    
+
         result_list = TopicUtils.get_tag_aggregation_topic_id_list(user_id,tag_id,offset,size)
         recommend_topic_ids_list = list()
         if len(result_list)>0:

trans2es/models/topic.py

@@ -39,7 +39,7 @@ class Topic(models.Model):
     group = models.ForeignKey(
         Group, verbose_name=u"关联的小组", related_name=u"group_topics",null=True, blank=True, default=None, on_delete=models.CASCADE)
     user_id = models.IntegerField(verbose_name='用户ID')
-    drop_score = models.IntegerField(verbose_name=u'人工赋分')
+    drop_score = models.IntegerField(verbose_name=u'人工赋分',default=0)
     description = models.CharField(verbose_name='日记本描述',max_length=200)
     content = models.CharField(verbose_name='日记本内容',max_length=1000)
     share_num = models.IntegerField(verbose_name='')