Skip to content
Projects
Groups
Snippets
Help
Loading...
Sign in
Toggle navigation
S
sun
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
钟尚武
sun
Commits
235b9cca
Commit
235b9cca
authored
6 years ago
by
许俊鹏
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'xujunpeng/hotfix/fix_1' into 'dev'
恢复误删代码 See merge request
alpha/sun!52
parents
167077c8
cd44c708
master
dev
like-pre/r01
quick-reply
refactor
test
No related merge requests found
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
2 additions
and
3 deletions
+2
-3
topic.py
api/topic.py
+1
-1
requirements.txt
requirements.txt
+1
-2
No files found.
api/topic.py
View file @
235b9cca
...
...
@@ -124,7 +124,7 @@ class TopicListBatchUpdate(APIView):
updates
=
self
.
handle_filter
(
request
.
POST
.
get
(
'updates'
,
"{}"
))
extra
=
json
.
loads
(
request
.
POST
.
get
(
'extra'
,
'{}'
))
try
:
self
.
rpc
[
'venus/sun/topic/batch/update'
](
updates
=
updates
,
ids
=
ids
)
.
unwrap
()
self
.
rpc
[
'venus/sun/topic/batch/update'
](
updates
=
updates
,
ids
=
ids
,
extra
=
extra
)
.
unwrap
()
except
Exception
as
e
:
error_logger
.
error
(
u'批量更新帖子失败
%
s'
,
e
)
raise
...
...
This diff is collapsed.
Click to expand it.
requirements.txt
View file @
235b9cca
...
...
@@ -12,4 +12,4 @@ git+ssh://git@git.wanmeizhensuo.com/backend/gm-config.git@v0.1.3
git+ssh://git@git.wanmeizhensuo.com/backend/gm-logging.git@v0.7.8
git+ssh://git@git.wanmeizhensuo.com/backend/gm-dataquery.git@v0.2.10
git+ssh://git@git.wanmeizhensuo.com/system/gm-tracer.git@v0.1.2
git+ssh://git@git.wanmeizhensuo.com/alpha/alpha-types.git@dev
\ No newline at end of file
git+ssh://git@git.wanmeizhensuo.com/alpha/alpha-types.git@master
This diff is collapsed.
Click to expand it.
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment