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
a80a8aab
Commit
a80a8aab
authored
4 years ago
by
OzzieIsaacs
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix LDAP import user
parent
d6fbcdb0
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
1023 additions
and
12704 deletions
+1023
-12704
admin.py
cps/admin.py
+1
-0
convert.py
cps/tasks/convert.py
+0
-1
Calibre-Web TestSummary_Linux.html
test/Calibre-Web TestSummary_Linux.html
+1022
-12703
No files found.
cps/admin.py
View file @
a80a8aab
...
...
@@ -614,6 +614,7 @@ def _configuration_ldap_helper(to_save, gdriveError):
reboot_required
|=
_config_string
(
to_save
,
"config_ldap_user_object"
)
reboot_required
|=
_config_string
(
to_save
,
"config_ldap_group_object_filter"
)
reboot_required
|=
_config_string
(
to_save
,
"config_ldap_group_members_field"
)
reboot_required
|=
_config_string
(
to_save
,
"config_ldap_member_user_object"
)
reboot_required
|=
_config_checkbox
(
to_save
,
"config_ldap_openldap"
)
reboot_required
|=
_config_int
(
to_save
,
"config_ldap_encryption"
)
reboot_required
|=
_config_string
(
to_save
,
"config_ldap_cacert_path"
)
...
...
This diff is collapsed.
Click to expand it.
cps/tasks/convert.py
View file @
a80a8aab
...
...
@@ -112,7 +112,6 @@ class TaskConvert(CalibreTask):
if
check
==
0
:
cur_book
=
local_db
.
get_book
(
book_id
)
if
os
.
path
.
isfile
(
file_path
+
format_new_ext
):
# check if format is already there and replace it if so, problem with gdrive kepub upload (why?)
new_format
=
db
.
Data
(
name
=
cur_book
.
data
[
0
]
.
name
,
book_format
=
self
.
settings
[
'new_book_format'
]
.
upper
(),
book
=
book_id
,
uncompressed_size
=
os
.
path
.
getsize
(
file_path
+
format_new_ext
))
...
...
This diff is collapsed.
Click to expand it.
test/Calibre-Web TestSummary_Linux.html
View file @
a80a8aab
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