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
48495f0d
Commit
48495f0d
authored
Jan 02, 2020
by
Ozzieisaacs
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'master' into Develop
# Conflicts: # cps/helper.py # cps/templates/user_edit.html # cps/web.py
parents
d9adb4fc
32e818af
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
3 additions
and
8 deletions
+3
-8
editbooks.py
cps/editbooks.py
+1
-2
user_edit.html
cps/templates/user_edit.html
+1
-1
web.py
cps/web.py
+1
-5
No files found.
cps/editbooks.py
View file @
48495f0d
...
@@ -689,8 +689,7 @@ def upload():
...
@@ -689,8 +689,7 @@ def upload():
db
.
session
.
commit
()
db
.
session
.
commit
()
db
.
update_title_sort
(
config
)
db
.
update_title_sort
(
config
)
book
=
db
.
session
.
query
(
db
.
Books
)
.
filter
(
db
.
Books
.
id
==
book_id
)
.
filter
(
common_filters
())
.
first
()
book
=
db
.
session
.
query
(
db
.
Books
)
.
filter
(
db
.
Books
.
id
==
book_id
)
.
filter
(
common_filters
())
.
first
()
# upload book to gdrive if necessary and add "(bookid)" to folder name
# upload book to gdrive if nesseccary and add "(bookid)" to folder name
if
config
.
config_use_google_drive
:
if
config
.
config_use_google_drive
:
gdriveutils
.
updateGdriveCalibreFromLocal
()
gdriveutils
.
updateGdriveCalibreFromLocal
()
error
=
helper
.
update_dir_stucture
(
book
.
id
,
config
.
config_calibre_dir
)
error
=
helper
.
update_dir_stucture
(
book
.
id
,
config
.
config_calibre_dir
)
...
...
cps/templates/user_edit.html
View file @
48495f0d
...
@@ -14,7 +14,7 @@
...
@@ -14,7 +14,7 @@
<input
type=
"email"
class=
"form-control"
name=
"email"
id=
"email"
value=
"{{ content.email if content.email != None }}"
autocomplete=
"off"
>
<input
type=
"email"
class=
"form-control"
name=
"email"
id=
"email"
value=
"{{ content.email if content.email != None }}"
autocomplete=
"off"
>
</div>
</div>
{% if ( g.user and g.user.role_passwd() or g.user.role_admin() ) and not content.role_anonymous() %}
{% if ( g.user and g.user.role_passwd() or g.user.role_admin() ) and not content.role_anonymous() %}
{% if g.user and g.user.role_admin() and not new_user and not profile and ( mail_configured and content.email if content.email != None %}
{% if g.user and g.user.role_admin() and not new_user and not profile and ( mail_configured and content.email if content.email != None
)
%}
<div
class=
"btn btn-default"
id=
"resend_password"
><a
href=
"{{url_for('admin.reset_user_password', user_id = content.id) }}"
>
{{_('Reset user Password')}}
</a></div>
<div
class=
"btn btn-default"
id=
"resend_password"
><a
href=
"{{url_for('admin.reset_user_password', user_id = content.id) }}"
>
{{_('Reset user Password')}}
</a></div>
{% endif %}
{% endif %}
<div
class=
"form-group"
>
<div
class=
"form-group"
>
...
...
cps/web.py
View file @
48495f0d
...
@@ -981,11 +981,7 @@ def render_read_books(page, are_read, as_xml=False, order=None, *args, **kwargs)
...
@@ -981,11 +981,7 @@ def render_read_books(page, are_read, as_xml=False, order=None, *args, **kwargs)
entries
,
random
,
pagination
=
fill_indexpage
(
page
,
db
.
Books
,
db_filter
,
order
)
entries
,
random
,
pagination
=
fill_indexpage
(
page
,
db
.
Books
,
db_filter
,
order
)
if
as_xml
:
if
as_xml
:
currtime
=
datetime
.
datetime
.
now
()
.
strftime
(
"
%
Y-
%
m-
%
dT
%
H:
%
M:
%
S+00:00"
)
return
entries
,
pagination
xml
=
render_template
(
current_time
=
currtime
,
instance
=
config
.
config_calibre_web_title
,
*
args
,
**
kwargs
)
response
=
make_response
(
xml
)
response
.
headers
[
"Content-Type"
]
=
"application/xml; charset=utf-8"
return
response
else
:
else
:
if
are_read
:
if
are_read
:
name
=
_
(
u'Read Books'
)
+
' ('
+
str
(
len
(
readBookIds
))
+
')'
name
=
_
(
u'Read Books'
)
+
' ('
+
str
(
len
(
readBookIds
))
+
')'
...
...
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