Commit 66a96d0d authored by 李小芳's avatar 李小芳

Merge branch 'pricipal' into 'master'

is_shouyejingxuan

See merge request !13
parents ccf84bb3 69a9c6d3
......@@ -48,7 +48,7 @@ def get_live_stream(pks):
item["topic_isnull"] = True if live.topic else False
item["topic_is_online"] = live.get_topic_is_online()
item['is_test'] = live.is_test
item['is_shouyejingxuan'] = 0
item['is_shouyejingxuan'] = False
item['is_show'] = live.is_show
item['stick_status'] = live.stick_status
item['stick_timestamp'] = live.stick_timestamp
......@@ -102,7 +102,7 @@ def get_live_notice(pks):
item["zhibo_time"] = int(time.mktime(zhibo_time.timetuple()))
except:
pass
item['is_shouyejingxuan'] = notice.is_shouyejingxuan
item['is_shouyejingxuan'] = True if notice.is_shouyejingxuan else False
item["show_order"] = 999
item["article_type"] = None
item["status"] = None
......@@ -145,7 +145,7 @@ def get_activity(pks):
item["hera_is_online"] = None
item["topic_isnull"] = None
item["topic_is_online"] = None
item['is_shouyejingxuan'] = 0
item['is_shouyejingxuan'] = False
item['is_show'] = 1
data.append(item)
logging.info("get data:%s" % data)
......@@ -179,7 +179,7 @@ def get_video_tractate(pks):
item["hera_is_online"] = softarticle.hera_is_online
item["topic_isnull"] = None
item["topic_is_online"] = None
item['is_shouyejingxuan'] = 0
item['is_shouyejingxuan'] = False
item['is_show'] = 1
data.append(item)
logging.info("get data:%s" % data)
......@@ -213,7 +213,7 @@ def get_word_tractate(pks):
item["hera_is_online"] = softarticle.hera_is_online
item["topic_isnull"] = None
item["topic_is_online"] = None
item['is_shouyejingxuan'] = 0
item['is_shouyejingxuan'] = False
item['is_show'] = 1
data.append(item)
logging.info("get data:%s" % data)
......@@ -250,7 +250,7 @@ def get_article(pks):
item["hera_is_online"] = None
item["topic_isnull"] = None
item["topic_is_online"] = None
item['is_shouyejingxuan'] = 0
item['is_shouyejingxuan'] = False
item['is_show'] = 1
data.append(item)
logging.info("get data:%s" % data)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment