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
d04a78af
Commit
d04a78af
authored
Aug 17, 2019
by
Ozzieisaacs
Browse files
Options
Browse Files
Download
Plain Diff
Merge remote-tracking branch 'public_shelf/Develop' into Develop
parents
f566237b
4cbdccd3
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
1 addition
and
2 deletions
+1
-2
shelf.py
cps/shelf.py
+0
-1
layout.html
cps/templates/layout.html
+1
-1
No files found.
cps/shelf.py
View file @
d04a78af
...
...
@@ -268,7 +268,6 @@ def delete_shelf(shelf_id):
# @shelf.route("/shelfdown/<int:shelf_id>")
@
shelf
.
route
(
"/shelf/<int:shelf_id>"
,
defaults
=
{
'shelf_type'
:
1
})
@
shelf
.
route
(
"/shelf/<int:shelf_id>/<int:shelf_type>"
)
@
login_required
def
show_shelf
(
shelf_type
,
shelf_id
):
if
current_user
.
is_anonymous
:
shelf
=
ub
.
session
.
query
(
ub
.
Shelf
)
.
filter
(
ub
.
Shelf
.
is_public
==
1
,
ub
.
Shelf
.
id
==
shelf_id
)
.
first
()
...
...
cps/templates/layout.html
View file @
d04a78af
...
...
@@ -128,7 +128,7 @@
{% endif %}
{% endfor %}
{% if g.user.is_authenticated or allow_anonymous %}
{% if g.user.is_authenticated or
g.
allow_anonymous %}
<li
class=
"nav-head hidden-xs public-shelves"
>
{{_('Public Shelves')}}
</li>
{% for shelf in g.public_shelfes %}
<li><a
href=
"{{url_for('shelf.show_shelf', shelf_id=shelf.id)}}"
><span
class=
"glyphicon glyphicon-list public_shelf"
></span>
{{shelf.name|shortentitle(40)}}
</a></li>
...
...
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