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
f825c5ae
Commit
f825c5ae
authored
Sep 01, 2020
by
OzzieIsaacs
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'master' into Develop
parents
88427009
173484c3
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
2 additions
and
2 deletions
+2
-2
shelf.py
cps/shelf.py
+2
-2
No files found.
cps/shelf.py
View file @
f825c5ae
...
@@ -30,7 +30,7 @@ from sqlalchemy.sql.expression import func
...
@@ -30,7 +30,7 @@ from sqlalchemy.sql.expression import func
from
sqlalchemy.exc
import
OperationalError
,
InvalidRequestError
from
sqlalchemy.exc
import
OperationalError
,
InvalidRequestError
from
.
import
logger
,
ub
,
searched_ids
,
calibre_db
from
.
import
logger
,
ub
,
searched_ids
,
calibre_db
from
.web
import
render_title_template
from
.web
import
login_required_if_no_ano
,
render_title_template
shelf
=
Blueprint
(
'shelf'
,
__name__
)
shelf
=
Blueprint
(
'shelf'
,
__name__
)
...
@@ -341,7 +341,7 @@ def delete_shelf(shelf_id):
...
@@ -341,7 +341,7 @@ def delete_shelf(shelf_id):
@
shelf
.
route
(
"/shelf/<int:shelf_id>"
,
defaults
=
{
'shelf_type'
:
1
})
@
shelf
.
route
(
"/shelf/<int:shelf_id>"
,
defaults
=
{
'shelf_type'
:
1
})
@
shelf
.
route
(
"/shelf/<int:shelf_id>/<int:shelf_type>"
)
@
shelf
.
route
(
"/shelf/<int:shelf_id>/<int:shelf_type>"
)
@
login_required
@
login_required
_if_no_ano
def
show_shelf
(
shelf_type
,
shelf_id
):
def
show_shelf
(
shelf_type
,
shelf_id
):
shelf
=
ub
.
session
.
query
(
ub
.
Shelf
)
.
filter
(
ub
.
Shelf
.
id
==
shelf_id
)
.
first
()
shelf
=
ub
.
session
.
query
(
ub
.
Shelf
)
.
filter
(
ub
.
Shelf
.
id
==
shelf_id
)
.
first
()
...
...
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