Skip to content

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

add

parent ac4b0fee
Hide whitespace changes
Inline Side-by-side
Showing with 43 additions and 51 deletions
.idea/workspace.xml
View file @ d7001ffb
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="ChangeListManager">
<list default="true" id="d7dd36ca-85ef-4a59-9db5-8b1ee4993a4e" name="Default Changelist" comment="">
<change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/search/utils/group.py" beforeDir="false" afterPath="$PROJECT_DIR$/search/utils/group.py" afterDir="false" />
<change beforePath="$PROJECT_DIR$/search/utils/topic.py" beforeDir="false" afterPath="$PROJECT_DIR$/search/utils/topic.py" afterDir="false" />
<change beforePath="$PROJECT_DIR$/search/views/group.py" beforeDir="false" afterPath="$PROJECT_DIR$/search/views/group.py" afterDir="false" />
<change beforePath="$PROJECT_DIR$/search/views/topic.py" beforeDir="false" afterPath="$PROJECT_DIR$/search/views/topic.py" afterDir="false" />
</list>
<list default="true" id="d7dd36ca-85ef-4a59-9db5-8b1ee4993a4e" name="Default Changelist" comment="" />
<option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
<option name="SHOW_DIALOG" value="false" />
<option name="HIGHLIGHT_CONFLICTS" value="true" />
......@@ -71,6 +65,7 @@
<entry key="json" value="5" />
<entry key="py" value="54" />
<entry key="template" value="2" />
<entry key="xml" value="1" />
</counts>
</usages-collector>
<usages-collector id="statistics.file.types.open">
......@@ -78,6 +73,7 @@
<entry key="JSON" value="5" />
<entry key="PLAIN_TEXT" value="2" />
<entry key="Python" value="54" />
<entry key="XML" value="1" />
</counts>
</usages-collector>
<usages-collector id="statistics.file.extensions.edit">
......@@ -96,11 +92,11 @@
</component>
<component name="FileEditorManager">
<leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
<file pinned="false" current-in-tab="false">
<file pinned="false" current-in-tab="true">
<entry file="file://$PROJECT_DIR$/search/views/topic.py">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="430">
<caret line="228" column="79" selection-start-line="228" selection-start-column="79" selection-end-line="228" selection-end-column="79" />
<state relative-caret-position="305">
<caret line="178" column="35" lean-forward="true" selection-start-line="178" selection-start-column="7" selection-end-line="178" selection-end-column="35" />
<folding>
<element signature="e#466#1607#0" />
<element signature="e#1776#6597#0" />
......@@ -119,17 +115,10 @@
</entry>
</file>
<file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/search/views/pick.py">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="-1685" />
</provider>
</entry>
</file>
<file pinned="false" current-in-tab="true">
<entry file="file://$PROJECT_DIR$/search/views/group.py">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="127">
<caret line="35" column="37" selection-start-line="35" selection-start-column="7" selection-end-line="35" selection-end-column="37" />
<state relative-caret-position="135">
<caret line="35" column="35" lean-forward="true" selection-start-line="35" selection-start-column="7" selection-end-line="35" selection-end-column="35" />
<folding>
<element signature="e#392#904#0" />
</folding>
......@@ -137,6 +126,11 @@
</provider>
</entry>
</file>
<file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/app_conf.xml">
<provider selected="true" editor-type-id="text-editor" />
</entry>
</file>
<file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/search/utils/common.py">
<provider selected="true" editor-type-id="text-editor">
......@@ -353,7 +347,7 @@
<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="DB Execution Console" order="8" />
<window_info anchor="bottom" id="Terminal" order="9" visible="true" weight="0.15336788" />
<window_info anchor="bottom" id="Terminal" order="9" visible="true" weight="0.33989638" />
<window_info anchor="bottom" id="Python Console" order="10" />
<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" />
......@@ -396,9 +390,6 @@
</breakpoint-manager>
</component>
<component name="editorHistoryManager">
<entry file="file://$PROJECT_DIR$/app_conf.xml">
<provider selected="true" editor-type-id="text-editor" />
</entry>
<entry file="file://$PROJECT_DIR$/search/views/contrast_similar.py">
<provider selected="true" editor-type-id="text-editor" />
</entry>
......@@ -644,31 +635,6 @@
<state relative-caret-position="-28" />
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/search/views/topic.py">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="430">
<caret line="228" column="79" selection-start-line="228" selection-start-column="79" selection-end-line="228" selection-end-column="79" />
<folding>
<element signature="e#466#1607#0" />
<element signature="e#1776#6597#0" />
<element signature="e#4210#4221#0" />
<element signature="e#6727#6921#0" />
<element signature="e#7074#7716#0" />
<element signature="e#7816#8386#0" />
<element signature="e#8511#9086#0" />
<element signature="e#9334#11023#0" />
<element signature="e#11153#11816#0" />
<element signature="e#11930#12462#0" />
<element signature="e#12609#13203#0" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/search/views/pick.py">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="-1685" />
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/search/utils/group.py">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="90">
......@@ -687,16 +653,42 @@
</state>
</provider>
</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">
<provider selected="true" editor-type-id="text-editor" />
</entry>
<entry file="file://$PROJECT_DIR$/search/views/group.py">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="127">
<caret line="35" column="37" selection-start-line="35" selection-start-column="7" selection-end-line="35" selection-end-column="37" />
<state relative-caret-position="135">
<caret line="35" column="35" lean-forward="true" selection-start-line="35" selection-start-column="7" selection-end-line="35" selection-end-column="35" />
<folding>
<element signature="e#392#904#0" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/search/views/topic.py">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="305">
<caret line="178" column="35" lean-forward="true" selection-start-line="178" selection-start-column="7" selection-end-line="178" selection-end-column="35" />
<folding>
<element signature="e#466#1607#0" />
<element signature="e#1776#6597#0" />
<element signature="e#4210#4221#0" />
<element signature="e#6727#6921#0" />
<element signature="e#7074#7716#0" />
<element signature="e#7816#8386#0" />
<element signature="e#8511#9086#0" />
<element signature="e#9334#11023#0" />
<element signature="e#11153#11816#0" />
<element signature="e#11930#12462#0" />
<element signature="e#12609#13203#0" />
</folding>
</state>
</provider>
</entry>
</component>
<component name="masterDetails">
<states>
......
search/utils/topic.py
View file @ d7001ffb
......@@ -135,7 +135,7 @@ class TopicUtils(object):
try:
attention_user_id_list = list()
pick_user_id_list = list()
same_group_id_list = list()
same_pictorial_id_list = list()
user_tag_list = list()
result_dict = TopicUtils.get_related_user_info(user_id, 0, 1)
......
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