Skip to content

P
physical
Commit 2c48d50c authored by lixiaofang's avatar lixiaofang
Browse files
Options

add

parent 78ac32af
Hide whitespace changes
Inline Side-by-side
Showing with 52 additions and 42 deletions
.idea/workspace.xml
View file @ 2c48d50c
...@@ -2,7 +2,8 @@ ...@@ -2,7 +2,8 @@
<project version="4"> <project version="4">
<component name="ChangeListManager"> <component name="ChangeListManager">
<list default="true" id="d7dd36ca-85ef-4a59-9db5-8b1ee4993a4e" name="Default Changelist" comment=""> <list default="true" id="d7dd36ca-85ef-4a59-9db5-8b1ee4993a4e" name="Default Changelist" comment="">
<change beforePath="$PROJECT_DIR$/search/utils/topic.py" beforeDir="false" afterPath="$PROJECT_DIR$/search/utils/topic.py" afterDir="false" /> <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/search/views/group.py" beforeDir="false" afterPath="$PROJECT_DIR$/search/views/group.py" afterDir="false" />
</list> </list>
<option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" /> <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
<option name="SHOW_DIALOG" value="false" /> <option name="SHOW_DIALOG" value="false" />
...@@ -97,8 +98,8 @@ ...@@ -97,8 +98,8 @@
<file pinned="false" current-in-tab="false"> <file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/search/views/topic.py"> <entry file="file://$PROJECT_DIR$/search/views/topic.py">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="305"> <state relative-caret-position="375">
<caret line="178" column="7" lean-forward="true" selection-start-line="178" selection-start-column="7" selection-end-line="178" selection-end-column="36" /> <caret line="202" column="33" lean-forward="true" selection-start-line="202" selection-start-column="7" selection-end-line="202" selection-end-column="33" />
<folding> <folding>
<element signature="e#466#1607#0" /> <element signature="e#466#1607#0" />
<element signature="e#1776#6597#0" /> <element signature="e#1776#6597#0" />
...@@ -116,11 +117,11 @@ ...@@ -116,11 +117,11 @@
</provider> </provider>
</entry> </entry>
</file> </file>
<file pinned="false" current-in-tab="false"> <file pinned="false" current-in-tab="true">
<entry file="file://$PROJECT_DIR$/search/views/group.py"> <entry file="file://$PROJECT_DIR$/search/views/group.py">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="135"> <state relative-caret-position="555">
<caret line="35" column="35" lean-forward="true" selection-start-line="35" selection-start-column="7" selection-end-line="35" selection-end-column="35" /> <caret line="63" column="55" selection-start-line="63" selection-start-column="55" selection-end-line="63" selection-end-column="55" />
<folding> <folding>
<element signature="e#392#904#0" /> <element signature="e#392#904#0" />
</folding> </folding>
...@@ -145,23 +146,26 @@ ...@@ -145,23 +146,26 @@
<file pinned="false" current-in-tab="false"> <file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/search/utils/group.py"> <entry file="file://$PROJECT_DIR$/search/utils/group.py">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="90"> <state relative-caret-position="281">
<caret line="8" column="25" selection-start-line="8" selection-start-column="25" selection-end-line="8" selection-end-column="25" /> <caret line="115" column="16" selection-start-line="115" selection-start-column="16" selection-end-line="115" selection-end-column="16" />
<folding> <folding>
<element signature="e#142#4910#0" />
<element signature="e#218#1347#0" /> <element signature="e#218#1347#0" />
</folding> </folding>
</state> </state>
</provider> </provider>
</entry> </entry>
</file> </file>
<file pinned="false" current-in-tab="true"> <file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/search/utils/topic.py"> <entry file="file://$PROJECT_DIR$/search/utils/topic.py">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="-90"> <state relative-caret-position="1818">
<caret line="140" column="21" lean-forward="true" selection-start-line="140" selection-start-column="21" selection-end-line="140" selection-end-column="21" /> <caret line="177" column="13" lean-forward="true" selection-start-line="177" selection-start-column="13" selection-end-line="177" selection-end-column="13" />
<folding> <folding>
<element signature="e#47#61#0" expanded="true" /> <element signature="e#47#61#0" expanded="true" />
<element signature="e#5577#6100#0" />
<element signature="e#6165#6547#0" />
<element signature="e#6611#6863#0" />
<element signature="e#6921#7167#0" />
<element signature="e#12084#12118#0" /> <element signature="e#12084#12118#0" />
</folding> </folding>
</state> </state>
...@@ -209,6 +213,7 @@ ...@@ -209,6 +213,7 @@
<find>ES_INDEX_PREFIX</find> <find>ES_INDEX_PREFIX</find>
<find>pictorial_id</find> <find>pictorial_id</find>
<find>pictorial_name</find> <find>pictorial_name</find>
<find>get_recommend_topic_ids</find>
<find>group</find> <find>group</find>
</findStrings> </findStrings>
</component> </component>
...@@ -237,8 +242,8 @@ ...@@ -237,8 +242,8 @@
<option value="$PROJECT_DIR$/trans2es/utils/topic_transfer.py" /> <option value="$PROJECT_DIR$/trans2es/utils/topic_transfer.py" />
<option value="$PROJECT_DIR$/search/views/topic.py" /> <option value="$PROJECT_DIR$/search/views/topic.py" />
<option value="$PROJECT_DIR$/search/utils/group.py" /> <option value="$PROJECT_DIR$/search/utils/group.py" />
<option value="$PROJECT_DIR$/search/views/group.py" />
<option value="$PROJECT_DIR$/search/utils/topic.py" /> <option value="$PROJECT_DIR$/search/utils/topic.py" />
<option value="$PROJECT_DIR$/search/views/group.py" />
</list> </list>
</option> </option>
</component> </component>
...@@ -334,8 +339,9 @@ ...@@ -334,8 +339,9 @@
</component> </component>
<component name="ToolWindowManager"> <component name="ToolWindowManager">
<frame x="-309" y="-1080" width="1920" height="1080" extended-state="6" /> <frame x="-309" y="-1080" width="1920" height="1080" extended-state="6" />
<editor active="true" />
<layout> <layout>
<window_info content_ui="combo" id="Project" order="0" visible="true" weight="0.18114798" /> <window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.18114798" />
<window_info id="Structure" order="1" side_tool="true" weight="0.25" /> <window_info id="Structure" order="1" side_tool="true" weight="0.25" />
<window_info id="DB Browser" order="2" /> <window_info id="DB Browser" order="2" />
<window_info id="Favorites" order="3" side_tool="true" /> <window_info id="Favorites" order="3" side_tool="true" />
...@@ -348,7 +354,7 @@ ...@@ -348,7 +354,7 @@
<window_info anchor="bottom" id="TODO" order="6" /> <window_info anchor="bottom" id="TODO" order="6" />
<window_info anchor="bottom" id="Version Control" order="7" show_stripe_button="false" /> <window_info anchor="bottom" id="Version Control" order="7" show_stripe_button="false" />
<window_info anchor="bottom" id="DB Execution Console" order="8" /> <window_info anchor="bottom" id="DB Execution Console" order="8" />
<window_info active="true" anchor="bottom" id="Terminal" order="9" visible="true" weight="0.33989638" /> <window_info anchor="bottom" id="Terminal" order="9" visible="true" weight="0.013471503" />
<window_info anchor="bottom" id="Python Console" order="10" /> <window_info anchor="bottom" id="Python Console" order="10" />
<window_info anchor="bottom" id="Event Log" order="11" side_tool="true" /> <window_info anchor="bottom" id="Event Log" order="11" side_tool="true" />
<window_info anchor="right" id="Commander" internal_type="SLIDING" order="0" type="SLIDING" weight="0.4" /> <window_info anchor="right" id="Commander" internal_type="SLIDING" order="0" type="SLIDING" weight="0.4" />
...@@ -625,17 +631,6 @@ ...@@ -625,17 +631,6 @@
<state relative-caret-position="-28" /> <state relative-caret-position="-28" />
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/search/utils/group.py">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="90">
<caret line="8" column="25" selection-start-line="8" selection-start-column="25" selection-end-line="8" selection-end-column="25" />
<folding>
<element signature="e#142#4910#0" />
<element signature="e#218#1347#0" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/search/utils/common.py"> <entry file="file://$PROJECT_DIR$/search/utils/common.py">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="75"> <state relative-caret-position="75">
...@@ -643,26 +638,28 @@ ...@@ -643,26 +638,28 @@
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/app_conf.xml">
<provider selected="true" editor-type-id="text-editor" />
</entry>
<entry file="file://$PROJECT_DIR$/search/views/pick.py"> <entry file="file://$PROJECT_DIR$/search/views/pick.py">
<provider selected="true" editor-type-id="text-editor" /> <provider selected="true" editor-type-id="text-editor" />
</entry> </entry>
<entry file="file://$PROJECT_DIR$/search/views/group.py"> <entry file="file://$PROJECT_DIR$/search/utils/topic.py">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="135"> <state relative-caret-position="1818">
<caret line="35" column="35" lean-forward="true" selection-start-line="35" selection-start-column="7" selection-end-line="35" selection-end-column="35" /> <caret line="177" column="13" lean-forward="true" selection-start-line="177" selection-start-column="13" selection-end-line="177" selection-end-column="13" />
<folding> <folding>
<element signature="e#392#904#0" /> <element signature="e#47#61#0" expanded="true" />
<element signature="e#5577#6100#0" />
<element signature="e#6165#6547#0" />
<element signature="e#6611#6863#0" />
<element signature="e#6921#7167#0" />
<element signature="e#12084#12118#0" />
</folding> </folding>
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/search/views/topic.py"> <entry file="file://$PROJECT_DIR$/search/views/topic.py">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="305"> <state relative-caret-position="375">
<caret line="178" column="7" lean-forward="true" selection-start-line="178" selection-start-column="7" selection-end-line="178" selection-end-column="36" /> <caret line="202" column="33" lean-forward="true" selection-start-line="202" selection-start-column="7" selection-end-line="202" selection-end-column="33" />
<folding> <folding>
<element signature="e#466#1607#0" /> <element signature="e#466#1607#0" />
<element signature="e#1776#6597#0" /> <element signature="e#1776#6597#0" />
...@@ -679,13 +676,25 @@ ...@@ -679,13 +676,25 @@
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/search/utils/topic.py"> <entry file="file://$PROJECT_DIR$/app_conf.xml">
<provider selected="true" editor-type-id="text-editor" />
</entry>
<entry file="file://$PROJECT_DIR$/search/utils/group.py">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="-90"> <state relative-caret-position="281">
<caret line="140" column="21" lean-forward="true" selection-start-line="140" selection-start-column="21" selection-end-line="140" selection-end-column="21" /> <caret line="115" column="16" selection-start-line="115" selection-start-column="16" selection-end-line="115" selection-end-column="16" />
<folding> <folding>
<element signature="e#47#61#0" expanded="true" /> <element signature="e#218#1347#0" />
<element signature="e#12084#12118#0" /> </folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/search/views/group.py">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="555">
<caret line="63" column="55" selection-start-line="63" selection-start-column="55" selection-end-line="63" selection-end-column="55" />
<folding>
<element signature="e#392#904#0" />
</folding> </folding>
</state> </state>
</provider> </provider>
......
search/views/group.py
View file @ 2c48d50c
...@@ -34,7 +34,7 @@ def query_group(query="",offset=0,size=10): ...@@ -34,7 +34,7 @@ def query_group(query="",offset=0,size=10):
return {"group_ids":[]} return {"group_ids":[]}
@bind("physical/search/pictorial_sort") @bind("physical/search/pictorial_sort")
def group_sort(user_id=-1,sort_type=GroupSortTypes.HOT_RECOMMEND,offset=0,size=10): def pictorial_sort(user_id=-1,sort_type=GroupSortTypes.HOT_RECOMMEND,offset=0,size=10):
""" """
:remark 小组排序,缺少：前1天发评论人数＊x :remark 小组排序,缺少：前1天发评论人数＊x
:param user_id: :param user_id:
......
trans2es/models/topic.py
View file @ 2c48d50c
...@@ -87,7 +87,8 @@ class Topic(models.Model): ...@@ -87,7 +87,8 @@ class Topic(models.Model):
def get_pictorial_id(self): def get_pictorial_id(self):
try: try:
pictorial_id = PictorialTopic.objects.filter(topic_id=self.id) pictorial_id = PictorialTopic.objects.filter(topic_id=self.id)
logging.info("get user attention pictorial id :%s"%pictorial_id) if len(pictorial_id)> 0:
logging.info("get user attention pictorial id :%s"%pictorial_id)
return pictorial_id return pictorial_id
except: except:
logging.error("catch exception,err_msg:%s" % traceback.format_exc()) logging.error("catch exception,err_msg:%s" % traceback.format_exc())
......
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