Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Contribute to GitLab
Sign in / Register
Toggle navigation
D
douban-api-proxy
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
captainwong
douban-api-proxy
Commits
3c9f8b15
Commit
3c9f8b15
authored
Oct 01, 2017
by
unknown
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
added check for anonymous session in read_books, otherwise current_user.id is not defined
parent
d336f9fa
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
13 additions
and
7 deletions
+13
-7
web.py
cps/web.py
+13
-7
No files found.
cps/web.py
View file @
3c9f8b15
...
@@ -1713,15 +1713,21 @@ def feed_get_cover(book_id):
...
@@ -1713,15 +1713,21 @@ def feed_get_cover(book_id):
def
render_read_books
(
page
,
are_read
,
as_xml
=
False
):
def
render_read_books
(
page
,
are_read
,
as_xml
=
False
):
readBooks
=
ub
.
session
.
query
(
ub
.
ReadBook
)
.
filter
(
ub
.
ReadBook
.
user_id
==
int
(
current_user
.
id
))
.
filter
(
ub
.
ReadBook
.
is_read
==
True
)
.
all
()
if
not
current_user
.
is_anonymous
():
readBookIds
=
[
x
.
book_id
for
x
in
readBooks
]
readBooks
=
ub
.
session
.
query
(
ub
.
ReadBook
)
.
filter
(
ub
.
ReadBook
.
user_id
==
int
(
current_user
.
id
))
.
filter
(
ub
.
ReadBook
.
is_read
==
True
)
.
all
()
if
are_read
:
readBookIds
=
[
x
.
book_id
for
x
in
readBooks
]
db_filter
=
db
.
Books
.
id
.
in_
(
readBookIds
)
if
are_read
:
db_filter
=
db
.
Books
.
id
.
in_
(
readBookIds
)
else
:
db_filter
=
~
db
.
Books
.
id
.
in_
(
readBookIds
)
entries
,
random
,
pagination
=
fill_indexpage
(
page
,
db
.
Books
,
db_filter
,
db
.
Books
.
timestamp
.
desc
())
else
:
else
:
db_filter
=
~
db
.
Books
.
id
.
in_
(
readBookIds
)
entries
=
[]
random
=
False
pagination
=
Pagination
(
page
,
1
,
0
)
entries
,
random
,
pagination
=
fill_indexpage
(
page
,
db
.
Books
,
db_filter
,
db
.
Books
.
timestamp
.
desc
())
if
as_xml
:
if
as_xml
:
xml
=
render_title_template
(
'feed.xml'
,
entries
=
entries
,
pagination
=
pagination
)
xml
=
render_title_template
(
'feed.xml'
,
entries
=
entries
,
pagination
=
pagination
)
response
=
make_response
(
xml
)
response
=
make_response
(
xml
)
...
...
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